From 7da372d29ebce3deaec886e89d2db4afd1cec315 Mon Sep 17 00:00:00 2001
From: Liam Connors <connorsl@tcd.ie>
Date: Mon, 9 Sep 2024 12:02:35 -0400
Subject: [PATCH 1/6] update geopandas version

---
 .../plotly/test_requirements/requirements_310_optional.txt      | 2 +-
 .../plotly/test_requirements/requirements_311_optional.txt      | 2 +-
 .../test_requirements/requirements_312_no_numpy_optional.txt    | 2 +-
 .../plotly/test_requirements/requirements_312_optional.txt      | 2 +-
 .../plotly/test_requirements/requirements_38_optional.txt       | 2 +-
 .../plotly/test_requirements/requirements_39_optional.txt       | 2 +-
 .../test_requirements/requirements_39_pandas_2_optional.txt     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/python/plotly/test_requirements/requirements_310_optional.txt b/packages/python/plotly/test_requirements/requirements_310_optional.txt
index 105eda9b25..64f117c7fb 100644
--- a/packages/python/plotly/test_requirements/requirements_310_optional.txt
+++ b/packages/python/plotly/test_requirements/requirements_310_optional.txt
@@ -13,7 +13,7 @@ ipykernel==5.5.3
 jupyter==1.0.0
 scipy==1.11.4
 Shapely==1.8.5
-geopandas==0.9.0
+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
index 800dbeb6a2..e13c940988 100644
--- a/packages/python/plotly/test_requirements/requirements_311_optional.txt
+++ b/packages/python/plotly/test_requirements/requirements_311_optional.txt
@@ -13,7 +13,7 @@ ipykernel==5.5.3
 jupyter==1.0.0
 scipy==1.11.4
 Shapely==1.8.5
-geopandas==0.9.0
+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
index dbf02f2bea..2fd781846e 100644
--- 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
index 05185830b8..6a5beaff57 100644
--- 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_38_optional.txt b/packages/python/plotly/test_requirements/requirements_38_optional.txt
index 4eed0bb5e6..fd58a2abc3 100644
--- a/packages/python/plotly/test_requirements/requirements_38_optional.txt
+++ b/packages/python/plotly/test_requirements/requirements_38_optional.txt
@@ -13,7 +13,7 @@ ipykernel==5.5.3
 jupyter==1.0.0
 scipy==1.6.2
 Shapely==1.7.1
-geopandas==0.9.0
+geopandas==0.14.4
 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
index 3b950888ac..f49635e4bc 100644
--- a/packages/python/plotly/test_requirements/requirements_39_optional.txt
+++ b/packages/python/plotly/test_requirements/requirements_39_optional.txt
@@ -13,7 +13,7 @@ ipykernel==5.5.3
 jupyter==1.0.0
 scipy==1.6.2
 Shapely==1.7.1
-geopandas==0.9.0
+geopandas==0.14.4
 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
index c276481c91..44edc4eae5 100644
--- a/packages/python/plotly/test_requirements/requirements_39_pandas_2_optional.txt
+++ b/packages/python/plotly/test_requirements/requirements_39_pandas_2_optional.txt
@@ -13,7 +13,7 @@ ipykernel==5.5.3
 jupyter==1.0.0
 scipy==1.6.2
 Shapely==1.7.1
-geopandas==0.9.0
+geopandas==0.14.4
 pyshp==2.1.3
 matplotlib==3.8.0
 scikit-image==0.18.1

From c4f9cfa1447a8a032a5f8a0835a4c08e89d1f22f Mon Sep 17 00:00:00 2001
From: Liam Connors <connorsl@tcd.ie>
Date: Mon, 9 Sep 2024 12:06:50 -0400
Subject: [PATCH 2/6] update shapely version

---
 .../plotly/test_requirements/requirements_310_optional.txt      | 2 +-
 .../plotly/test_requirements/requirements_311_optional.txt      | 2 +-
 .../plotly/test_requirements/requirements_38_optional.txt       | 2 +-
 .../plotly/test_requirements/requirements_39_optional.txt       | 2 +-
 .../test_requirements/requirements_39_pandas_2_optional.txt     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/python/plotly/test_requirements/requirements_310_optional.txt b/packages/python/plotly/test_requirements/requirements_310_optional.txt
index 64f117c7fb..4beeaa6ffc 100644
--- a/packages/python/plotly/test_requirements/requirements_310_optional.txt
+++ b/packages/python/plotly/test_requirements/requirements_310_optional.txt
@@ -12,7 +12,7 @@ ipywidgets==8.0.2
 ipykernel==5.5.3
 jupyter==1.0.0
 scipy==1.11.4
-Shapely==1.8.5
+Shapely==2.0.2
 geopandas==0.14.4
 pyshp==2.1.3
 matplotlib==3.8.0
diff --git a/packages/python/plotly/test_requirements/requirements_311_optional.txt b/packages/python/plotly/test_requirements/requirements_311_optional.txt
index e13c940988..c0e4a679d7 100644
--- a/packages/python/plotly/test_requirements/requirements_311_optional.txt
+++ b/packages/python/plotly/test_requirements/requirements_311_optional.txt
@@ -12,7 +12,7 @@ ipywidgets==8.0.2
 ipykernel==5.5.3
 jupyter==1.0.0
 scipy==1.11.4
-Shapely==1.8.5
+Shapely==2.0.2
 geopandas==0.14.4
 pyshp==2.1.3
 matplotlib==3.8.0
diff --git a/packages/python/plotly/test_requirements/requirements_38_optional.txt b/packages/python/plotly/test_requirements/requirements_38_optional.txt
index fd58a2abc3..3b9351016d 100644
--- a/packages/python/plotly/test_requirements/requirements_38_optional.txt
+++ b/packages/python/plotly/test_requirements/requirements_38_optional.txt
@@ -12,7 +12,7 @@ ipywidgets==8.0.2
 ipykernel==5.5.3
 jupyter==1.0.0
 scipy==1.6.2
-Shapely==1.7.1
+Shapely==2.0.2
 geopandas==0.14.4
 pyshp==2.1.3
 matplotlib==3.7.3
diff --git a/packages/python/plotly/test_requirements/requirements_39_optional.txt b/packages/python/plotly/test_requirements/requirements_39_optional.txt
index f49635e4bc..f99a15ff88 100644
--- a/packages/python/plotly/test_requirements/requirements_39_optional.txt
+++ b/packages/python/plotly/test_requirements/requirements_39_optional.txt
@@ -12,7 +12,7 @@ ipywidgets==8.0.2
 ipykernel==5.5.3
 jupyter==1.0.0
 scipy==1.6.2
-Shapely==1.7.1
+Shapely==2.0.2
 geopandas==0.14.4
 pyshp==2.1.3
 matplotlib==3.8.0
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
index 44edc4eae5..06a5a61f3e 100644
--- 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,7 +12,7 @@ ipywidgets==8.0.2
 ipykernel==5.5.3
 jupyter==1.0.0
 scipy==1.6.2
-Shapely==1.7.1
+Shapely==2.0.2
 geopandas==0.14.4
 pyshp==2.1.3
 matplotlib==3.8.0

From e553d0d99f59865a6f4fcf34d279c9347d759b55 Mon Sep 17 00:00:00 2001
From: Liam Connors <connorsl@tcd.ie>
Date: Mon, 9 Sep 2024 12:24:58 -0400
Subject: [PATCH 3/6] change geopandas versions and specify version for fiona

---
 .../plotly/test_requirements/requirements_39_optional.txt      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/python/plotly/test_requirements/requirements_39_optional.txt b/packages/python/plotly/test_requirements/requirements_39_optional.txt
index f99a15ff88..37791cb5a6 100644
--- a/packages/python/plotly/test_requirements/requirements_39_optional.txt
+++ b/packages/python/plotly/test_requirements/requirements_39_optional.txt
@@ -13,7 +13,8 @@ ipykernel==5.5.3
 jupyter==1.0.0
 scipy==1.6.2
 Shapely==2.0.2
-geopandas==0.14.4
+geopandas==0.13.2
+fiona<=1.9.6
 pyshp==2.1.3
 matplotlib==3.8.0
 scikit-image==0.18.1

From 4014d77888a2f045a83bca5eac0a07ef22c2f6d5 Mon Sep 17 00:00:00 2001
From: Liam Connors <connorsl@tcd.ie>
Date: Mon, 9 Sep 2024 12:39:28 -0400
Subject: [PATCH 4/6] change geopandas versions and specify version for fiona
 py 3.8

---
 .../plotly/test_requirements/requirements_38_optional.txt      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/python/plotly/test_requirements/requirements_38_optional.txt b/packages/python/plotly/test_requirements/requirements_38_optional.txt
index 3b9351016d..b77d1a0acb 100644
--- a/packages/python/plotly/test_requirements/requirements_38_optional.txt
+++ b/packages/python/plotly/test_requirements/requirements_38_optional.txt
@@ -13,7 +13,8 @@ ipykernel==5.5.3
 jupyter==1.0.0
 scipy==1.6.2
 Shapely==2.0.2
-geopandas==0.14.4
+geopandas==0.13.2
+fiona<=1.9.6
 pyshp==2.1.3
 matplotlib==3.7.3
 scikit-image==0.18.1

From 735d43ac2043bfeb12509648f22205d5e8ca7a8b Mon Sep 17 00:00:00 2001
From: Liam Connors <connorsl@tcd.ie>
Date: Mon, 9 Sep 2024 12:46:01 -0400
Subject: [PATCH 5/6] remove old python version tests

---
 .../requirements_36_core.txt                  |  4 ----
 .../requirements_36_optional.txt              | 21 ------------------
 .../requirements_37_core.txt                  |  3 ---
 .../requirements_37_optional.txt              | 22 -------------------
 4 files changed, 50 deletions(-)
 delete mode 100644 packages/python/plotly/test_requirements/requirements_36_core.txt
 delete mode 100644 packages/python/plotly/test_requirements/requirements_36_optional.txt
 delete mode 100644 packages/python/plotly/test_requirements/requirements_37_core.txt
 delete mode 100644 packages/python/plotly/test_requirements/requirements_37_optional.txt

diff --git a/packages/python/plotly/test_requirements/requirements_36_core.txt b/packages/python/plotly/test_requirements/requirements_36_core.txt
deleted file mode 100644
index 0f02fc47bd..0000000000
--- a/packages/python/plotly/test_requirements/requirements_36_core.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-requests==2.12.4
-tenacity==6.2.0
-pytest==3.5.1
-packaging
diff --git a/packages/python/plotly/test_requirements/requirements_36_optional.txt b/packages/python/plotly/test_requirements/requirements_36_optional.txt
deleted file mode 100644
index 3fb4185e9c..0000000000
--- a/packages/python/plotly/test_requirements/requirements_36_optional.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-requests==2.12.4
-tenacity==6.2.0
-pandas==0.24.2
-numpy==1.19.5
-xarray==0.10.9
-statsmodels==0.10.2
-pillow==5.2.0
-pytest==3.5.1
-pytz==2016.10
-ipython[all]==5.4.0
-ipywidgets==7.2.0
-ipykernel==4.8.2
-jupyter==1.0.0
-scipy==1.2.3
-shapely==1.7.0
-geopandas==0.3.0
-pyshp==1.2.10
-matplotlib==2.2.3
-scikit-image==0.14.4
-psutil==5.7.0
-kaleido
diff --git a/packages/python/plotly/test_requirements/requirements_37_core.txt b/packages/python/plotly/test_requirements/requirements_37_core.txt
deleted file mode 100644
index c5d8fc5703..0000000000
--- a/packages/python/plotly/test_requirements/requirements_37_core.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-requests==2.12.4
-tenacity==6.2.0
-pytest==3.5.1
diff --git a/packages/python/plotly/test_requirements/requirements_37_optional.txt b/packages/python/plotly/test_requirements/requirements_37_optional.txt
deleted file mode 100644
index 173ecf501c..0000000000
--- a/packages/python/plotly/test_requirements/requirements_37_optional.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-requests==2.12.4
-tenacity==6.2.0
-pandas==0.24.2
-numpy==1.19.5
-xarray==0.10.9
-statsmodels==0.10.2
-pillow==6.2.0
-pytest==3.5.1
-pytz==2016.10
-ipython[all]==5.4.0
-ipywidgets==7.2.0
-ipykernel==4.8.2
-jupyter==1.0.0
-scipy==1.2.3
-shapely==1.7.0
-geopandas==0.3.0
-pyshp==1.2.10
-matplotlib==3.5.3
-scikit-image==0.14.4
-psutil==5.7.0
-kaleido
-orjson==3.8.12

From cae1f814c69f309cd563dfd28f968bdc9107dcc6 Mon Sep 17 00:00:00 2001
From: Liam Connors <connorsl@tcd.ie>
Date: Mon, 9 Sep 2024 13:02:13 -0400
Subject: [PATCH 6/6] Update config.yml

---
 .circleci/config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9f7fec1ebb..6e329d1080 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -617,4 +617,3 @@ workflows:
       - python_39_percy
       - python_312_no_numpy
       - build-doc
-