From 4ef310fb87d0b15992032fa21a315f630aca64de Mon Sep 17 00:00:00 2001 From: Nicolas Kruchten Date: Wed, 1 Apr 2020 11:23:51 -0400 Subject: [PATCH 1/2] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index d67e7641bf0..a0cb7b0ceb3 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,6 @@ - PyPI Downloads From e2738828d694c9cda7f9974695ac407243751fa6 Mon Sep 17 00:00:00 2001 From: Nicolas Kruchten Date: Fri, 3 Apr 2020 16:48:13 -0400 Subject: [PATCH 2/2] clean up ci jobs (#2355) * clean up ci jobs * upgrade shapely dep * upgrade deps * more version constellation tuning * scipy compatible with both --- .circleci/config.yml | 8 ++------ packages/python/plotly/tox.ini | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7c90978fe1a..854036d4667 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -504,12 +504,8 @@ workflows: - python-2.7-optional - python-3.5-optional - python-3.6-optional - # 3.7 optional disabled due to current shapely incompatibility - # - python-3.7-optional - - python-2.7-plot_ly - - python-3.7-plot_ly: - requires: - - python-2.7-plot_ly + - python-3.7-optional + - python-3.7-plot_ly - python-2-7-orca - python-3-5-orca - python-3-7-orca diff --git a/packages/python/plotly/tox.ini b/packages/python/plotly/tox.ini index 095ec2fd3e9..6297713789c 100644 --- a/packages/python/plotly/tox.ini +++ b/packages/python/plotly/tox.ini @@ -66,8 +66,8 @@ deps= optional: ipywidgets==7.2.0 optional: ipykernel==4.8.2 optional: jupyter==1.0.0 - optional: scipy==0.18.1 - optional: shapely==1.6.4 + optional: scipy==1.2.3 + optional: shapely==1.7.0 optional: geopandas==0.3.0 optional: pyshp==1.2.10 optional: pillow==5.2.0