Skip to content

Commit b3f7254

Browse files
authored
Support Python 3.10 and Drop Python 3.5 (#487)
* linux: Use manylinux2014 * mac: Drop Python 3.6 too
1 parent 9b84e49 commit b3f7254

File tree

7 files changed

+38
-13
lines changed

7 files changed

+38
-13
lines changed

.github/workflows/linux.yml

+11
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,17 @@ jobs:
4747
pytest -v test
4848
4949
50+
- name: Set up Python 3.10
51+
uses: actions/setup-python@v1
52+
with:
53+
python-version: "3.10"
54+
55+
- name: Run test (3.10)
56+
run: |
57+
pip install pytest
58+
pip install -v msgpack --only-binary :all: --no-index -f dist/wheelhouse
59+
pytest -v test
60+
5061
- name: Set up Python 3.9
5162
uses: actions/setup-python@v1
5263
with:

.github/workflows/mac.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ jobs:
3535
pytest -v test
3636
3737
38-
- name: Set up Python 3.9
38+
- name: Set up Python 3.10
3939
uses: actions/setup-python@v1
4040
with:
41-
python-version: "3.9"
41+
python-version: "3.10"
4242

4343
- name: Build wheel
4444
run: |
@@ -52,10 +52,10 @@ jobs:
5252
pytest -v test
5353
5454
55-
- name: Set up Python 3.7
55+
- name: Set up Python 3.9
5656
uses: actions/setup-python@v1
5757
with:
58-
python-version: "3.7"
58+
python-version: "3.9"
5959

6060
- name: Build wheel
6161
run: |
@@ -69,10 +69,10 @@ jobs:
6969
pytest -v test
7070
7171
72-
- name: Set up Python 3.6
72+
- name: Set up Python 3.7
7373
uses: actions/setup-python@v1
7474
with:
75-
python-version: "3.6"
75+
python-version: "3.7"
7676

7777
- name: Build wheel
7878
run: |

.github/workflows/windows.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,20 @@ jobs:
7777
run: |
7878
ci/runtests.sh
7979
80+
- name: Python 3.10 (amd64)
81+
env:
82+
PYTHON: "py -3.10-64"
83+
shell: bash
84+
run: |
85+
ci/runtests.sh
86+
87+
- name: Python 3.10 (x86)
88+
env:
89+
PYTHON: "py -3.10-32"
90+
shell: bash
91+
run: |
92+
ci/runtests.sh
93+
8094
- name: Upload Wheels
8195
uses: actions/upload-artifact@v1
8296
with:

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ update-docker:
3636

3737
.PHONY: linux-wheel
3838
linux-wheel:
39-
docker run --rm -v `pwd`:/project -w /project quay.io/pypa/manylinux1_i686 bash docker/buildwheel.sh
40-
docker run --rm -v `pwd`:/project -w /project quay.io/pypa/manylinux1_x86_64 bash docker/buildwheel.sh
39+
docker run --rm -v `pwd`:/project -w /project quay.io/pypa/manylinux2014_i686 bash docker/buildwheel.sh
40+
docker run --rm -v `pwd`:/project -w /project quay.io/pypa/manylinux2014_x86_64 bash docker/buildwheel.sh
4141

4242
.PHONY: linux-arm64-wheel
4343
linux-arm64-wheel:

docker/buildwheel.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ set -e -x
77
ARCH=`uname -p`
88
echo "arch=$ARCH"
99

10+
ls /opt/python
11+
1012
for V in "${PYTHON_VERSIONS[@]}"; do
1113
PYBIN=/opt/python/$V/bin
1214
rm -rf build/ # Avoid lib build by narrow Python is used by wide python
13-
$PYBIN/python setup.py bdist_wheel
15+
$PYBIN/python -m build -w
1416
done
1517

1618
cd dist

docker/shared.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PYTHON_VERSIONS=(
2+
cp310-cp310
23
cp39-cp39
34
cp38-cp38
45
cp37-cp37m
56
cp36-cp36m
6-
cp35-cp35m
77
)

setup.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,12 @@ def __init__(self, *args, **kwargs):
125125
},
126126
license="Apache 2.0",
127127
classifiers=[
128-
"Programming Language :: Python :: 2",
129-
"Programming Language :: Python :: 2.7",
130128
"Programming Language :: Python :: 3",
131-
"Programming Language :: Python :: 3.5",
132129
"Programming Language :: Python :: 3.6",
133130
"Programming Language :: Python :: 3.7",
134131
"Programming Language :: Python :: 3.8",
135132
"Programming Language :: Python :: 3.9",
133+
"Programming Language :: Python :: 3.10",
136134
"Programming Language :: Python :: Implementation :: CPython",
137135
"Programming Language :: Python :: Implementation :: PyPy",
138136
"Intended Audience :: Developers",

0 commit comments

Comments
 (0)