Skip to content

Commit ff7a804

Browse files
authored
Add wheel support for Python 3.10 and drop Python 3.6 (#2622)
1 parent e2f3f3b commit ff7a804

File tree

5 files changed

+28
-14
lines changed

5 files changed

+28
-14
lines changed

.github/workflows/core-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
fail-fast: false
1010
matrix:
1111
os: [ubuntu-latest]
12-
python-version: [3.6, 3.7, 3.8, 3.9, 3.8-cython]
12+
python-version: [3.7, 3.8, 3.9, 3.8-cython]
1313
include:
1414
- { os: ubuntu-latest, python-version: 3.8-cython, no-common-tests: 1,
1515
no-deploy: 1, with-cython: 1 }

.github/workflows/platform-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ jobs:
110110
111111
if [ -n "$WITH_HADOOP" ]; then
112112
source $CONDA/bin/activate test
113+
source ./ci/reload-env.sh
113114
pytest $PYTEST_CONFIG -m hadoop
114115
coverage report
115116
fi

.github/workflows/pypi-cd.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
os: [ubuntu-latest, macOS-latest, windows-latest]
15-
python-version: [3.6, 3.7, 3.8, 3.9]
16-
node-version: [14.x]
15+
python-version: ["3.7", "3.8", "3.9", "3.10"]
16+
node-version: ["14.x"]
1717
include:
18-
- { os: ubuntu-latest, python-version: 3.6, python-abis: "cp36-cp36m" }
19-
- { os: ubuntu-latest, python-version: 3.7, python-abis: "cp37-cp37m" }
20-
- { os: ubuntu-latest, python-version: 3.8, python-abis: "cp38-cp38" }
21-
- { os: ubuntu-latest, python-version: 3.9, python-abis: "cp39-cp39" }
22-
- { os: windows-latest, python-version: 3.9, build-static: 1 }
18+
- { os: ubuntu-latest, python-version: "3.7", python-abis: "cp37-cp37m" }
19+
- { os: ubuntu-latest, python-version: "3.8", python-abis: "cp38-cp38" }
20+
- { os: ubuntu-latest, python-version: "3.9", python-abis: "cp39-cp39" }
21+
- { os: ubuntu-latest, python-version: "3.10", python-abis: "cp310-cp310" }
22+
- { os: windows-latest, python-version: "3.10", build-static: 1 }
2323

2424
steps:
2525
- name: Check out code
@@ -60,10 +60,14 @@ jobs:
6060
if: startsWith(github.ref, 'refs/tags/') && matrix.no-deploy != '1'
6161
shell: bash
6262
env:
63-
DOCKER_IMAGE: "quay.io/pypa/manylinux1_x86_64"
6463
PYABI: ${{ matrix.python-abis }}
6564
BUILD_STATIC: ${{ matrix.build-static }}
6665
PYPI_PWD: ${{ secrets.PYPI_PASSWORD }}
6766
run: |
6867
source ./ci/reload-env.sh
68+
if [[ "$PYTHON" =~ "3.10" ]]; then
69+
export DOCKER_IMAGE="quay.io/pypa/manylinux2014_x86_64"
70+
else
71+
export DOCKER_IMAGE="quay.io/pypa/manylinux1_x86_64"
72+
fi
6973
source ./.github/workflows/upload-packages.sh

ci/install-conda.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fi
1616

1717
CONDA_FILE="Miniconda3-latest-${CONDA_OS}-x86_64.${FILE_EXT}"
1818

19-
TEST_PACKAGES="virtualenv psutil pyyaml"
19+
TEST_PACKAGES="virtualenv"
2020

2121
if [[ "$FILE_EXT" == "sh" ]]; then
2222
curl -L -o "miniconda.${FILE_EXT}" https://repo.continuum.io/miniconda/$CONDA_FILE
@@ -28,10 +28,13 @@ else
2828
CONDA=$(echo "/$CONDA" | sed -e 's/\\/\//g' -e 's/://')
2929
echo "Using installed conda at $CONDA"
3030
CONDA_BIN_PATH=$CONDA/Scripts
31-
export PATH="$CONDA/envs/test/Scripts:$CONDA/envs/test:$CONDA/Scripts:$CONDA:$PATH"
3231
fi
3332
$CONDA_BIN_PATH/conda create --quiet --yes -n test python=$PYTHON $TEST_PACKAGES
3433

34+
if [[ "$CONDA_OS" == "Windows" ]]; then
35+
source "$CONDA/Scripts/activate" test
36+
fi
37+
3538
#check python version
3639
export PYTHON=$(python -c "import sys; print('.'.join(str(v) for v in sys.version_info[:3]))")
3740
echo "Installed Python version: $PYTHON"

ci/requirements-wheel.txt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
numpy==1.14.5; python_version<'3.9'
2-
numpy==1.19.3; python_version>='3.9'
2+
numpy==1.19.3; python_version>='3.9' and python_version<'3.10'
3+
numpy==1.21.4; python_version>='3.10'
4+
35
pandas==1.0.4; python_version<'3.9'
4-
pandas==1.1.3; python_version>='3.9'
6+
pandas==1.1.3; python_version>='3.9' and python_version<'3.10'
7+
pandas==1.3.4; python_version>='3.10'
8+
59
scipy==1.4.1; python_version<'3.9'
6-
scipy==1.5.4; python_version>='3.9'
10+
scipy==1.5.4; python_version>='3.9' and python_version<'3.10'
11+
scipy==1.7.2; python_version>='3.10'
12+
713
cython==0.29.21
814
requests>=2.4.0
915
cloudpickle>=1.5.0

0 commit comments

Comments
 (0)