From b905afce202c9113ddfd78d8deaeed2f1ca4e74a Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Tue, 20 Dec 2022 10:35:46 +0000 Subject: [PATCH 1/4] temporarily pin numpy --- ci/deps/actions-310-numpydev.yaml | 2 +- ci/deps/actions-310.yaml | 2 +- ci/deps/actions-38-downstream_compat.yaml | 2 +- ci/deps/actions-38.yaml | 2 +- ci/deps/actions-39.yaml | 2 +- ci/deps/actions-pypy-38.yaml | 2 +- ci/deps/circle-38-arm64.yaml | 2 +- environment.yml | 2 +- requirements-dev.txt | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ci/deps/actions-310-numpydev.yaml b/ci/deps/actions-310-numpydev.yaml index 44acae877bdf8..863c231b18c4f 100644 --- a/ci/deps/actions-310-numpydev.yaml +++ b/ci/deps/actions-310-numpydev.yaml @@ -22,5 +22,5 @@ dependencies: - "cython" - "--extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple" - "--pre" - - "numpy" + - "numpy<1.24" - "scipy" diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index 6ea073f3df5c8..610531b80b767 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -18,7 +18,7 @@ dependencies: # required dependencies - python-dateutil - - numpy + - numpy<1.24 - pytz # optional dependencies diff --git a/ci/deps/actions-38-downstream_compat.yaml b/ci/deps/actions-38-downstream_compat.yaml index 3f9fdf3ede923..06eec411cd710 100644 --- a/ci/deps/actions-38-downstream_compat.yaml +++ b/ci/deps/actions-38-downstream_compat.yaml @@ -19,7 +19,7 @@ dependencies: # required dependencies - python-dateutil - - numpy + - numpy<1.24 - pytz # optional dependencies diff --git a/ci/deps/actions-38.yaml b/ci/deps/actions-38.yaml index e3579bbb6033b..a89955cec830c 100644 --- a/ci/deps/actions-38.yaml +++ b/ci/deps/actions-38.yaml @@ -18,7 +18,7 @@ dependencies: # required dependencies - python-dateutil - - numpy + - numpy<1.24 - pytz # optional dependencies diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index e408a2e0e2cb7..5cc891a3b4e1a 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -18,7 +18,7 @@ dependencies: # required dependencies - python-dateutil - - numpy + - numpy<1.24 - pytz # optional dependencies diff --git a/ci/deps/actions-pypy-38.yaml b/ci/deps/actions-pypy-38.yaml index 17d39a4c53ac3..054129c4198a1 100644 --- a/ci/deps/actions-pypy-38.yaml +++ b/ci/deps/actions-pypy-38.yaml @@ -19,6 +19,6 @@ dependencies: - hypothesis>=5.5.3 # required - - numpy + - numpy<1.24 - python-dateutil - pytz diff --git a/ci/deps/circle-38-arm64.yaml b/ci/deps/circle-38-arm64.yaml index ca51f8c74f457..0e92f6ad46c39 100644 --- a/ci/deps/circle-38-arm64.yaml +++ b/ci/deps/circle-38-arm64.yaml @@ -18,7 +18,7 @@ dependencies: # required dependencies - python-dateutil - - numpy + - numpy<1.24 - pytz # optional dependencies diff --git a/environment.yml b/environment.yml index 55732ca58a529..1448ac148015e 100644 --- a/environment.yml +++ b/environment.yml @@ -20,7 +20,7 @@ dependencies: # required dependencies - python-dateutil - - numpy + - numpy<1.24 - pytz # optional dependencies diff --git a/requirements-dev.txt b/requirements-dev.txt index ba0651e3d6734..38c09f3ffc284 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -11,7 +11,7 @@ psutil pytest-asyncio>=0.17 coverage python-dateutil -numpy +numpy<1.24 pytz beautifulsoup4 blosc From dcaf7ce8f50eba5168788fd979aaeb8619973087 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Tue, 20 Dec 2022 10:58:32 +0000 Subject: [PATCH 2/4] pin in asv.conf too --- asv_bench/asv.conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asv_bench/asv.conf.json b/asv_bench/asv.conf.json index 16f8f28b66d31..7ee1e5a8c110d 100644 --- a/asv_bench/asv.conf.json +++ b/asv_bench/asv.conf.json @@ -41,7 +41,7 @@ // pip (with all the conda available packages installed first, // followed by the pip installed packages). "matrix": { - "numpy": [], + "numpy<": ["1.24"], "Cython": ["0.29.32"], "matplotlib": [], "sqlalchemy": [], From 3f8a048af42587ebc075f57e6a67bcf4c87c7ecd Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Tue, 20 Dec 2022 10:59:27 +0000 Subject: [PATCH 3/4] Revert "pin in asv.conf too" This reverts commit dcaf7ce8f50eba5168788fd979aaeb8619973087. --- asv_bench/asv.conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asv_bench/asv.conf.json b/asv_bench/asv.conf.json index 7ee1e5a8c110d..16f8f28b66d31 100644 --- a/asv_bench/asv.conf.json +++ b/asv_bench/asv.conf.json @@ -41,7 +41,7 @@ // pip (with all the conda available packages installed first, // followed by the pip installed packages). "matrix": { - "numpy<": ["1.24"], + "numpy": [], "Cython": ["0.29.32"], "matplotlib": [], "sqlalchemy": [], From 427e09965dc225dfff52c647085b74868e182c52 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Tue, 20 Dec 2022 11:02:13 +0000 Subject: [PATCH 4/4] use exact pin --- asv_bench/asv.conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asv_bench/asv.conf.json b/asv_bench/asv.conf.json index 16f8f28b66d31..6e548bf9d9e8a 100644 --- a/asv_bench/asv.conf.json +++ b/asv_bench/asv.conf.json @@ -41,7 +41,7 @@ // pip (with all the conda available packages installed first, // followed by the pip installed packages). "matrix": { - "numpy": [], + "numpy": ["1.23.5"], // https://github.com/pandas-dev/pandas/pull/50356 "Cython": ["0.29.32"], "matplotlib": [], "sqlalchemy": [],