From f23f28316f6e963a8129725e2860d5ac55027848 Mon Sep 17 00:00:00 2001 From: Nicolas Kruchten Date: Fri, 3 Apr 2020 16:03:14 -0400 Subject: [PATCH 1/5] clean up ci jobs --- .circleci/config.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 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 From 8807976db0ac6dc909285eea4aa34c18cdd552a6 Mon Sep 17 00:00:00 2001 From: Nicolas Kruchten Date: Fri, 3 Apr 2020 16:08:18 -0400 Subject: [PATCH 2/5] upgrade shapely dep --- packages/python/plotly/tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/python/plotly/tox.ini b/packages/python/plotly/tox.ini index 095ec2fd3e9..7369da41214 100644 --- a/packages/python/plotly/tox.ini +++ b/packages/python/plotly/tox.ini @@ -67,7 +67,7 @@ deps= optional: ipykernel==4.8.2 optional: jupyter==1.0.0 optional: scipy==0.18.1 - optional: shapely==1.6.4 + optional: shapely==1.7.0 optional: geopandas==0.3.0 optional: pyshp==1.2.10 optional: pillow==5.2.0 From 473818e3f0721b5433e49b43bd1f199b7a8bcbba Mon Sep 17 00:00:00 2001 From: Nicolas Kruchten Date: Fri, 3 Apr 2020 16:14:34 -0400 Subject: [PATCH 3/5] upgrade deps --- packages/python/plotly/tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/python/plotly/tox.ini b/packages/python/plotly/tox.ini index 7369da41214..fc89f7b62e2 100644 --- a/packages/python/plotly/tox.ini +++ b/packages/python/plotly/tox.ini @@ -61,12 +61,12 @@ deps= xarray==0.10.9 backports.tempfile==1.0 optional: --editable=file:///{toxinidir}/../plotly-geo - optional: numpy==1.16.5 + optional: numpy==1.18.2 optional: ipython[all]==5.1.0 optional: ipywidgets==7.2.0 optional: ipykernel==4.8.2 optional: jupyter==1.0.0 - optional: scipy==0.18.1 + optional: scipy==1.4.1 optional: shapely==1.7.0 optional: geopandas==0.3.0 optional: pyshp==1.2.10 From 4ae8e39ff8706be19247b84c150551d7b276b128 Mon Sep 17 00:00:00 2001 From: Nicolas Kruchten Date: Fri, 3 Apr 2020 16:24:00 -0400 Subject: [PATCH 4/5] more version constellation tuning --- packages/python/plotly/tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/python/plotly/tox.ini b/packages/python/plotly/tox.ini index fc89f7b62e2..352051ed0db 100644 --- a/packages/python/plotly/tox.ini +++ b/packages/python/plotly/tox.ini @@ -61,7 +61,7 @@ deps= xarray==0.10.9 backports.tempfile==1.0 optional: --editable=file:///{toxinidir}/../plotly-geo - optional: numpy==1.18.2 + optional: numpy==1.16.5 optional: ipython[all]==5.1.0 optional: ipywidgets==7.2.0 optional: ipykernel==4.8.2 From 77cb3162291cd8bfa2ea5d0b859af477eb4e6e8d Mon Sep 17 00:00:00 2001 From: Nicolas Kruchten Date: Fri, 3 Apr 2020 16:28:14 -0400 Subject: [PATCH 5/5] scipy compatible with both --- packages/python/plotly/tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/python/plotly/tox.ini b/packages/python/plotly/tox.ini index 352051ed0db..6297713789c 100644 --- a/packages/python/plotly/tox.ini +++ b/packages/python/plotly/tox.ini @@ -66,7 +66,7 @@ deps= optional: ipywidgets==7.2.0 optional: ipykernel==4.8.2 optional: jupyter==1.0.0 - optional: scipy==1.4.1 + optional: scipy==1.2.3 optional: shapely==1.7.0 optional: geopandas==0.3.0 optional: pyshp==1.2.10