Merge branch 'master' into update-master-with-docs-changes

LiamConnors · web-flow · commit 2d6efecd0541 · 2024-09-09T15:37:34.000-04:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -617,4 +617,3 @@ workflows:
       - python_39_percy
       - python_312_no_numpy
       - build-doc
-
diff --git a/packages/python/plotly/test_requirements/requirements_310_optional.txt b/packages/python/plotly/test_requirements/requirements_310_optional.txt
@@ -12,8 +12,8 @@ ipywidgets==8.0.2
 ipykernel==5.5.3
 jupyter==1.0.0
 scipy==1.11.4
-Shapely==1.8.5
-geopandas==0.9.0
+Shapely==2.0.2
+geopandas==0.14.4
 pyshp==2.1.3
 matplotlib==3.8.0
 scikit-image==0.22.0
diff --git a/packages/python/plotly/test_requirements/requirements_311_optional.txt b/packages/python/plotly/test_requirements/requirements_311_optional.txt
@@ -12,8 +12,8 @@ ipywidgets==8.0.2
 ipykernel==5.5.3
 jupyter==1.0.0
 scipy==1.11.4
-Shapely==1.8.5
-geopandas==0.9.0
+Shapely==2.0.2
+geopandas==0.14.4
 pyshp==2.1.3
 matplotlib==3.8.0
 scikit-image==0.22.0
diff --git a/packages/python/plotly/test_requirements/requirements_312_no_numpy_optional.txt b/packages/python/plotly/test_requirements/requirements_312_no_numpy_optional.txt
@@ -12,7 +12,7 @@ ipykernel==5.5.3
 jupyter==1.0.0
 scipy==1.11.4
 Shapely==2.0.2
-geopandas==0.14.2
+geopandas==0.14.4
 pyshp==2.3.1
 matplotlib==3.8.2
 scikit-image==0.22.0
diff --git a/packages/python/plotly/test_requirements/requirements_312_optional.txt b/packages/python/plotly/test_requirements/requirements_312_optional.txt
@@ -13,7 +13,7 @@ ipykernel==5.5.3
 jupyter==1.0.0
 scipy==1.11.4
 Shapely==2.0.2
-geopandas==0.14.2
+geopandas==0.14.4
 pyshp==2.3.1
 matplotlib==3.8.2
 scikit-image==0.22.0
diff --git a/packages/python/plotly/test_requirements/requirements_36_core.txt b/packages/python/plotly/test_requirements/requirements_36_core.txt
diff --git a/packages/python/plotly/test_requirements/requirements_36_optional.txt b/packages/python/plotly/test_requirements/requirements_36_optional.txt
diff --git a/packages/python/plotly/test_requirements/requirements_37_core.txt b/packages/python/plotly/test_requirements/requirements_37_core.txt
diff --git a/packages/python/plotly/test_requirements/requirements_37_optional.txt b/packages/python/plotly/test_requirements/requirements_37_optional.txt
diff --git a/packages/python/plotly/test_requirements/requirements_38_optional.txt b/packages/python/plotly/test_requirements/requirements_38_optional.txt
@@ -12,8 +12,9 @@ ipywidgets==8.0.2
 ipykernel==5.5.3
 jupyter==1.0.0
 scipy==1.6.2
-Shapely==1.7.1
-geopandas==0.9.0
+Shapely==2.0.2
+geopandas==0.13.2
+fiona<=1.9.6
 pyshp==2.1.3
 matplotlib==3.7.3
 scikit-image==0.18.1
diff --git a/packages/python/plotly/test_requirements/requirements_39_optional.txt b/packages/python/plotly/test_requirements/requirements_39_optional.txt
@@ -12,8 +12,9 @@ ipywidgets==8.0.2
 ipykernel==5.5.3
 jupyter==1.0.0
 scipy==1.6.2
-Shapely==1.7.1
-geopandas==0.9.0
+Shapely==2.0.2
+geopandas==0.13.2
+fiona<=1.9.6
 pyshp==2.1.3
 matplotlib==3.8.0
 scikit-image==0.18.1
diff --git a/packages/python/plotly/test_requirements/requirements_39_pandas_2_optional.txt b/packages/python/plotly/test_requirements/requirements_39_pandas_2_optional.txt
@@ -12,8 +12,8 @@ ipywidgets==8.0.2
 ipykernel==5.5.3
 jupyter==1.0.0
 scipy==1.6.2
-Shapely==1.7.1
-geopandas==0.9.0
+Shapely==2.0.2
+geopandas==0.14.4
 pyshp==2.1.3
 matplotlib==3.8.0
 scikit-image==0.18.1
