From 476c93cdc7abc02fe4f13b4b39b19db1301d2a03 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Fri, 27 May 2022 14:06:23 -0700 Subject: [PATCH 1/2] Backport PR #47150: DEPS: Bump Cython --- ci/deps/actions-310.yaml | 2 +- ci/deps/actions-38-downstream_compat.yaml | 2 +- ci/deps/actions-38-minimum_versions.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 +- doc/source/whatsnew/v1.4.3.rst | 2 +- environment.yml | 2 +- requirements-dev.txt | 2 +- setup.py | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index dac1219245e84..7a879b5ac9648 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -5,7 +5,7 @@ dependencies: - python=3.10 # test dependencies - - cython=0.29.24 + - cython=0.29.30 - pytest>=6.0 - pytest-cov - pytest-xdist>=1.31 diff --git a/ci/deps/actions-38-downstream_compat.yaml b/ci/deps/actions-38-downstream_compat.yaml index 01415122e6076..cd501b1e018ef 100644 --- a/ci/deps/actions-38-downstream_compat.yaml +++ b/ci/deps/actions-38-downstream_compat.yaml @@ -6,7 +6,7 @@ dependencies: - python=3.8 # test dependencies - - cython=0.29.24 + - cython=0.29.30 - pytest>=6.0 - pytest-cov - pytest-xdist>=1.31 diff --git a/ci/deps/actions-38-minimum_versions.yaml b/ci/deps/actions-38-minimum_versions.yaml index f3a967f67cbc3..f6c3f3855aa02 100644 --- a/ci/deps/actions-38-minimum_versions.yaml +++ b/ci/deps/actions-38-minimum_versions.yaml @@ -7,7 +7,7 @@ dependencies: - python=3.8.0 # test dependencies - - cython=0.29.24 + - cython=0.29.30 - pytest>=6.0 - pytest-cov - pytest-xdist>=1.31 diff --git a/ci/deps/actions-38.yaml b/ci/deps/actions-38.yaml index 79cd831051c2f..4d2ffbfbd9ce5 100644 --- a/ci/deps/actions-38.yaml +++ b/ci/deps/actions-38.yaml @@ -5,7 +5,7 @@ dependencies: - python=3.8 # test dependencies - - cython=0.29.24 + - cython=0.29.30 - pytest>=6.0 - pytest-cov - pytest-xdist>=1.31 diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index 1c681104f3196..202db035a6c52 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -5,7 +5,7 @@ dependencies: - python=3.9 # test dependencies - - cython=0.29.24 + - cython=0.29.30 - pytest>=6.0 - pytest-cov - pytest-xdist>=1.31 diff --git a/ci/deps/actions-pypy-38.yaml b/ci/deps/actions-pypy-38.yaml index eda35ee14ec65..1a3c73cb4ae2f 100644 --- a/ci/deps/actions-pypy-38.yaml +++ b/ci/deps/actions-pypy-38.yaml @@ -8,7 +8,7 @@ dependencies: - python=3.8[build=*_pypy] # TODO: use this once pypy3.8 is available # tools - - cython>=0.29.24 + - cython>=0.29.30 - pytest>=6.0 - pytest-cov - pytest-asyncio diff --git a/ci/deps/circle-38-arm64.yaml b/ci/deps/circle-38-arm64.yaml index 66fedccc5eca7..5d3f79602ed37 100644 --- a/ci/deps/circle-38-arm64.yaml +++ b/ci/deps/circle-38-arm64.yaml @@ -5,7 +5,7 @@ dependencies: - python=3.8 # test dependencies - - cython=0.29.24 + - cython=0.29.30 - pytest>=6.0 - pytest-cov - pytest-xdist>=1.31 diff --git a/doc/source/whatsnew/v1.4.3.rst b/doc/source/whatsnew/v1.4.3.rst index f0e208a117068..85e5983f877e8 100644 --- a/doc/source/whatsnew/v1.4.3.rst +++ b/doc/source/whatsnew/v1.4.3.rst @@ -38,7 +38,7 @@ Bug fixes Other ~~~~~ -- +- The minimum version of Cython needed to compile pandas is now ``0.29.30`` (:issue:`41935`) - .. --------------------------------------------------------------------------- diff --git a/environment.yml b/environment.yml index 0fbfb8236a135..83b00c0dd6421 100644 --- a/environment.yml +++ b/environment.yml @@ -15,7 +15,7 @@ dependencies: # The compiler packages are meta-packages and install the correct compiler (activation) packages on the respective platforms. - c-compiler - cxx-compiler - - cython>=0.29.24 + - cython>=0.29.30 # code checks - black=22.3.0 diff --git a/requirements-dev.txt b/requirements-dev.txt index 5ede7b99a3d22..05a9f0426440d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,7 +5,7 @@ numpy>=1.18.5 python-dateutil>=2.8.1 pytz asv -cython>=0.29.24 +cython>=0.29.30 black==22.3.0 cpplint flake8==4.0.1 diff --git a/setup.py b/setup.py index db65ea72e4a96..ec3fa3c0433f4 100755 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ def is_platform_mac(): # note: sync with pyproject.toml, environment.yml and asv.conf.json -min_cython_ver = "0.29.24" +min_cython_ver = "0.29.30" try: from Cython import ( From 7e5c3c1755fd32c77cae16db251b0faf37ef2049 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Sat, 28 May 2022 09:05:13 +0000 Subject: [PATCH 2/2] cython==0.29.30 in ci/deps/actions-310-numpydev.yaml --- ci/deps/actions-310-numpydev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/actions-310-numpydev.yaml b/ci/deps/actions-310-numpydev.yaml index 401be14aaca02..2ac97cc479196 100644 --- a/ci/deps/actions-310-numpydev.yaml +++ b/ci/deps/actions-310-numpydev.yaml @@ -16,7 +16,7 @@ dependencies: - pytz - pip - pip: - - cython==0.29.24 # GH#34014 + - cython==0.29.30 # GH#34014 - "--extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple" - "--pre" - "numpy"