Skip to content

Commit cf44b88

Browse files
lithomas1lithomas1
authored
Backport PR #43729: DEPS: Upgrade Deps for Python 3.10 (#44036)
1 parent 554439a commit cf44b88

21 files changed

+44
-34
lines changed

‎.github/actions/build_pandas/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ runs:
1313
- name: Build Pandas
1414
run: |
1515
python setup.py build_ext -j 2
16-
python -m pip install -e . --no-build-isolation --no-use-pep517
16+
python -m pip install -e . --no-build-isolation --no-use-pep517 --no-index
1717
shell: bash -l {0}

‎.github/workflows/sdist.yml

+19-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ jobs:
2323
strategy:
2424
fail-fast: false
2525
matrix:
26-
python-version: ["3.7", "3.8", "3.9"]
26+
python-version: ["3.7", "3.8", "3.9", "3.10"]
27+
concurrency:
28+
group: ${{github.ref}}-${{matrix.python-version}}-sdist
29+
cancel-in-progress: ${{github.event_name == 'pull_request'}}
2730

2831
steps:
2932
- uses: actions/checkout@v2
@@ -50,13 +53,26 @@ jobs:
5053
- uses: conda-incubator/setup-miniconda@v2
5154
with:
5255
activate-environment: pandas-sdist
53-
python-version: ${{ matrix.python-version }}
56+
python-version: '${{ matrix.python-version }}'
5457

5558
- name: Install pandas from sdist
5659
run: |
57-
conda list
60+
pip list
5861
python -m pip install dist/*.gz
5962
63+
- name: Force oldest supported NumPy
64+
run: |
65+
case "${{matrix.python-version}}" in
66+
3.7)
67+
pip install numpy==1.17.3 ;;
68+
3.8)
69+
pip install numpy==1.18.5 ;;
70+
3.9)
71+
pip install numpy==1.19.3 ;;
72+
3.10)
73+
pip install numpy==1.21.2 ;;
74+
esac
75+
6076
- name: Import pandas
6177
run: |
6278
cd ..

‎ci/deps/actions-37-db-min.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencies:
55
- python=3.7.*
66

77
# tools
8-
- cython>=0.29.21
8+
- cython>=0.29.24
99
- pytest>=6.0
1010
- pytest-cov
1111
- pytest-xdist>=1.21

‎ci/deps/actions-37-db.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencies:
55
- python=3.7.*
66

77
# tools
8-
- cython>=0.29.21
8+
- cython>=0.29.24
99
- pytest>=6.0
1010
- pytest-xdist>=1.21
1111
- hypothesis>=3.58.0

‎ci/deps/actions-37-locale_slow.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66
- python=3.7.*
77

88
# tools
9-
- cython>=0.29.21
9+
- cython>=0.29.24
1010
- pytest>=6.0
1111
- pytest-cov
1212
- pytest-xdist>=1.21

‎ci/deps/actions-37-minimum_versions.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencies:
55
- python=3.7.1
66

77
# tools
8-
- cython=0.29.21
8+
- cython=0.29.24
99
- pytest>=6.0
1010
- pytest-cov
1111
- pytest-xdist>=1.21

‎ci/deps/actions-37-slow.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66
- python=3.7.*
77

88
# tools
9-
- cython>=0.29.21
9+
- cython>=0.29.24
1010
- pytest>=6.0
1111
- pytest-cov
1212
- pytest-xdist>=1.21

‎ci/deps/actions-37.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66
- python=3.7.*
77

88
# tools
9-
- cython>=0.29.21
9+
- cython>=0.29.24
1010
- pytest>=6.0
1111
- pytest-cov
1212
- pytest-xdist>=1.21

‎ci/deps/actions-38-locale.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencies:
55
- python=3.8.*
66

77
# tools
8-
- cython>=0.29.21
8+
- cython>=0.29.24
99
- pytest>=6.0
1010
- pytest-cov
1111
- pytest-xdist>=1.21

‎ci/deps/actions-38-numpydev.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515
- pytz
1616
- pip
1717
- pip:
18-
- cython==0.29.21 # GH#34014
18+
- cython==0.29.24 # GH#34014
1919
- "--extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple"
2020
- "--pre"
2121
- "numpy"

‎ci/deps/actions-38-slow.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencies:
55
- python=3.8.*
66

77
# tools
8-
- cython>=0.29.21
8+
- cython>=0.29.24
99
- pytest>=6.0
1010
- pytest-cov
1111
- pytest-xdist>=1.21

‎ci/deps/actions-38.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66
- python=3.8.*
77

88
# tools
9-
- cython>=0.29.21
9+
- cython>=0.29.24
1010
- pytest>=6.0
1111
- pytest-cov
1212
- pytest-xdist>=1.21

‎ci/deps/actions-39.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencies:
55
- python=3.9.*
66

77
# tools
8-
- cython>=0.29.21
8+
- cython>=0.29.24
99
- pytest>=6.0
1010
- pytest-cov
1111
- pytest-xdist>=1.21

‎ci/deps/azure-macos-37.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ dependencies:
3232
- xlwt
3333
- pip
3434
- pip:
35-
- cython>=0.29.21
35+
- cython>=0.29.24
3636
- pyreadstat
3737
- pyxlsb

‎ci/deps/azure-windows-37.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66
- python=3.7.*
77

88
# tools
9-
- cython>=0.29.21
9+
- cython>=0.29.24
1010
- pytest>=6.0
1111
- pytest-xdist>=1.21
1212
- hypothesis>=3.58.0

‎ci/deps/azure-windows-38.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66
- python=3.8.*
77

88
# tools
9-
- cython>=0.29.21
9+
- cython>=0.29.24
1010
- pytest>=6.0
1111
- pytest-xdist>=1.21
1212
- hypothesis>=3.58.0

‎ci/deps/circle-37-arm64.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencies:
55
- python=3.7.*
66

77
# tools
8-
- cython>=0.29.21
8+
- cython>=0.29.24
99
- pytest>=6.0
1010
- pytest-xdist>=1.21
1111
- hypothesis>=3.58.0

‎doc/source/whatsnew/v1.3.4.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Bug fixes
4242

4343
Other
4444
~~~~~
45-
-
45+
- The minimum version of Cython needed to compile pandas is now ``0.29.24`` (:issue:`43729`)
4646
-
4747

4848
.. ---------------------------------------------------------------------------

‎pyproject.toml

+2-12
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,8 @@
44
requires = [
55
"setuptools>=51.0.0",
66
"wheel",
7-
"Cython>=0.29.21,<3", # Note: sync with setup.py
8-
# Numpy requirements for different OS/architectures
9-
# Copied from https://github.com/scipy/scipy/blob/master/pyproject.toml (which is also licensed under BSD)
10-
"numpy==1.17.3; python_version=='3.7' and (platform_machine!='arm64' or platform_system!='Darwin') and platform_machine!='aarch64'",
11-
"numpy==1.18.3; python_version=='3.8' and (platform_machine!='arm64' or platform_system!='Darwin') and platform_machine!='aarch64'",
12-
"numpy==1.19.3; python_version>='3.9' and (platform_machine!='arm64' or platform_system!='Darwin')",
13-
# Aarch64(Python 3.9 requirements are the same as AMD64)
14-
"numpy==1.19.2; python_version=='3.7' and platform_machine=='aarch64'",
15-
"numpy==1.19.2; python_version=='3.8' and platform_machine=='aarch64'",
16-
# Darwin Arm64
17-
"numpy>=1.20.0; python_version=='3.8' and platform_machine=='arm64' and platform_system=='Darwin'",
18-
"numpy>=1.20.0; python_version=='3.9' and platform_machine=='arm64' and platform_system=='Darwin'"
7+
"Cython>=0.29.24,<3", # Note: sync with setup.py
8+
"oldest-supported-numpy>=0.10"
199
]
2010
# uncomment to enable pep517 after versioneer problem is fixed.
2111
# https://github.com/python-versioneer/python-versioneer/issues/193

‎setup.cfg

+5-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ classifiers =
2222
Programming Language :: Python :: 3.7
2323
Programming Language :: Python :: 3.8
2424
Programming Language :: Python :: 3.9
25+
Programming Language :: Python :: 3.10
2526
Topic :: Scientific/Engineering
2627
project_urls =
2728
Bug Tracker = https://github.com/pandas-dev/pandas/issues
@@ -31,7 +32,10 @@ project_urls =
3132
[options]
3233
packages = find:
3334
install_requires =
34-
numpy>=1.17.3
35+
numpy>=1.17.3; platform_machine!='aarch64' and platform_machine!='arm64' and python_version<'3.10'
36+
numpy>=1.19.2; platform_machine=='aarch64' and python_version<'3.10'
37+
numpy>=1.20.0; platform_machine=='arm64' and python_version<'3.10'
38+
numpy>=1.21.0; python_version>='3.10'
3539
python-dateutil>=2.7.3
3640
pytz>=2017.3
3741
python_requires = >=3.7.1

‎setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def is_platform_mac():
3737
return sys.platform == "darwin"
3838

3939

40-
min_cython_ver = "0.29.21" # note: sync with pyproject.toml
40+
min_cython_ver = "0.29.24" # note: sync with pyproject.toml
4141

4242
try:
4343
from Cython import (

0 commit comments

Comments
 (0)