From f2d08bc22b9a0b831f455736f7a6894706ce7153 Mon Sep 17 00:00:00 2001 From: Emily Kellison-Linn <4672118+emilykl@users.noreply.github.com> Date: Fri, 7 Mar 2025 17:36:53 -0500 Subject: [PATCH 1/8] bump python versions in ci and add python 3.13 --- .circleci/config.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 50157d7beb..da913e39ff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ executors: parameters: python_version: description: "python version" - default: "3.10" + default: "3.12" type: string docker: - image: cimg/python:<>-browsers @@ -120,7 +120,7 @@ commands: jobs: check-code-formatting: docker: - - image: cimg/python:3.7 + - image: cimg/python:3.12 steps: - checkout @@ -139,7 +139,7 @@ jobs: test_core_py: parameters: python_version: - default: "3.10" + default: "3.12" type: string executor: name: docker-container @@ -150,7 +150,7 @@ jobs: test_optional_py: parameters: python_version: - default: "3.10" + default: "3.12" type: string pandas_version: default: "" @@ -224,7 +224,7 @@ jobs: plotlyjs_dev_build: docker: - - image: cimg/python:3.11-node + - image: cimg/python:3.12-node environment: LANG: en_US.UTF-8 resource_class: large @@ -263,7 +263,7 @@ jobs: full_build: docker: - - image: cimg/python:3.11-node + - image: cimg/python:3.12-node environment: LANG: en_US.UTF-8 resource_class: large @@ -302,8 +302,8 @@ jobs: resource_class: xlarge docker: # specify the version you desire here - # use `-browsers` prefix for selenium tests, for example, `3.9-browsers` - - image: cimg/python:3.9-browsers + # use `-browsers` prefix for selenium tests, for example, `3.12-browsers` + - image: cimg/python:3.12-browsers steps: - add_ssh_keys: @@ -435,6 +435,7 @@ workflows: - "3.10" - "3.11" - "3.12" + - "3.13" - test_optional_py: matrix: parameters: @@ -444,6 +445,7 @@ workflows: - "3.10" - "3.11" - "3.12" + - "3.13" - test_optional_py: name: "test_optional_py-3.9_pandas-1.2.4" python_version: "3.9" From 40c1004d1045d6b014b0df751ad8e05de68f52a5 Mon Sep 17 00:00:00 2001 From: Emily Kellison-Linn <4672118+emilykl@users.noreply.github.com> Date: Fri, 7 Mar 2025 17:41:41 -0500 Subject: [PATCH 2/8] build-doc won't run on python 3.12, rip --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index da913e39ff..2d06deb603 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -303,7 +303,7 @@ jobs: docker: # specify the version you desire here # use `-browsers` prefix for selenium tests, for example, `3.12-browsers` - - image: cimg/python:3.12-browsers + - image: cimg/python:3.11-browsers steps: - add_ssh_keys: From f96c25f541e5f6a1f5e7ff339ae38693ce8259cb Mon Sep 17 00:00:00 2001 From: Emily Kellison-Linn <4672118+emilykl@users.noreply.github.com> Date: Fri, 7 Mar 2025 17:47:14 -0500 Subject: [PATCH 3/8] bump python version from 3.9 to 3.12 for percy tests (will this work?) --- .circleci/config.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2d06deb603..773a7423f8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -167,9 +167,9 @@ jobs: numpy_version: <> # Percy - python_39_percy: + python_312_percy: docker: - - image: cimg/python:3.9-browsers + - image: cimg/python:3.12-browsers environment: PERCY_ENABLED: True PERCY_PROJECT: plotly/plotly.py @@ -203,7 +203,6 @@ jobs: source .venv/bin/activate mkdir tests/percy/pandas2 mv tests/percy/*.html tests/percy/pandas2/ - # 1.1 is the earliest minor with Py3.9 wheels uv pip install pip python -m pip install pandas==1.1.5 numpy==1.26.4 python tests/percy/plotly-express.py @@ -451,5 +450,5 @@ workflows: python_version: "3.9" pandas_version: "1.2.4" numpy_version: "1.26.4" - - python_39_percy + - python_312_percy - build-doc From 02a23ffe6310c3e5687de8f272011d80235dd109 Mon Sep 17 00:00:00 2001 From: Emily Kellison-Linn <4672118+emilykl@users.noreply.github.com> Date: Fri, 7 Mar 2025 17:48:19 -0500 Subject: [PATCH 4/8] remove scipy pin --- doc/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 4e3b17ef58..74cc8e5a80 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -5,7 +5,7 @@ jupyter notebook pandas==1.4.0 statsmodels==0.14.2 -scipy==1.9.1 +scipy patsy==0.5.6 numpy==1.22.4 plotly-geo From e8cb1f07dad9672d1f72efeacb1d69cb3856d36b Mon Sep 17 00:00:00 2001 From: Emily Kellison-Linn <4672118+emilykl@users.noreply.github.com> Date: Fri, 7 Mar 2025 17:52:51 -0500 Subject: [PATCH 5/8] try 3.11 for percy tests --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 773a7423f8..f81a582d4d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -167,9 +167,9 @@ jobs: numpy_version: <> # Percy - python_312_percy: + python_311_percy: docker: - - image: cimg/python:3.12-browsers + - image: cimg/python:3.11-browsers environment: PERCY_ENABLED: True PERCY_PROJECT: plotly/plotly.py @@ -450,5 +450,5 @@ workflows: python_version: "3.9" pandas_version: "1.2.4" numpy_version: "1.26.4" - - python_312_percy + - python_311_percy - build-doc From 533f5f73c6ef3cf93281957d03f974ca0010afe8 Mon Sep 17 00:00:00 2001 From: Emily Kellison-Linn <4672118+emilykl@users.noreply.github.com> Date: Mon, 10 Mar 2025 11:28:04 -0400 Subject: [PATCH 6/8] use python 3.9 for build-doc --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f81a582d4d..32944fea05 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -300,9 +300,7 @@ jobs: build-doc: resource_class: xlarge docker: - # specify the version you desire here - # use `-browsers` prefix for selenium tests, for example, `3.12-browsers` - - image: cimg/python:3.11-browsers + - image: cimg/python:3.9-browsers steps: - add_ssh_keys: From 3e0a46c5a7be3ee53e8f7040a84cfdf21870b42a Mon Sep 17 00:00:00 2001 From: Emily Kellison-Linn <4672118+emilykl@users.noreply.github.com> Date: Mon, 10 Mar 2025 11:33:25 -0400 Subject: [PATCH 7/8] bump pandas 1 version for Percy tests --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 32944fea05..3b36cc4802 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -204,7 +204,7 @@ jobs: mkdir tests/percy/pandas2 mv tests/percy/*.html tests/percy/pandas2/ uv pip install pip - python -m pip install pandas==1.1.5 numpy==1.26.4 + python -m pip install pandas==1.5.3 numpy==1.26.4 python tests/percy/plotly-express.py python tests/percy/compare-pandas.py rm -rf tests/percy/pandas2 From 18f844409194d246af86a8865c0a9110470f0538 Mon Sep 17 00:00:00 2001 From: Emily Kellison-Linn <4672118+emilykl@users.noreply.github.com> Date: Mon, 10 Mar 2025 12:05:46 -0400 Subject: [PATCH 8/8] re-pin scipy version --- doc/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 74cc8e5a80..4e3b17ef58 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -5,7 +5,7 @@ jupyter notebook pandas==1.4.0 statsmodels==0.14.2 -scipy +scipy==1.9.1 patsy==0.5.6 numpy==1.22.4 plotly-geo