Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Python 3.10 and Drop Python 3.5 #487

Merged
merged 5 commits into from
Nov 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,17 @@ jobs:
pytest -v test


- name: Set up Python 3.10
uses: actions/setup-python@v1
with:
python-version: "3.10"

- name: Run test (3.10)
run: |
pip install pytest
pip install -v msgpack --only-binary :all: --no-index -f dist/wheelhouse
pytest -v test

- name: Set up Python 3.9
uses: actions/setup-python@v1
with:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ jobs:
pytest -v test


- name: Set up Python 3.9
- name: Set up Python 3.10
uses: actions/setup-python@v1
with:
python-version: "3.9"
python-version: "3.10"

- name: Build wheel
run: |
Expand All @@ -52,10 +52,10 @@ jobs:
pytest -v test


- name: Set up Python 3.7
- name: Set up Python 3.9
uses: actions/setup-python@v1
with:
python-version: "3.7"
python-version: "3.9"

- name: Build wheel
run: |
Expand All @@ -69,10 +69,10 @@ jobs:
pytest -v test


- name: Set up Python 3.6
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: "3.6"
python-version: "3.7"

- name: Build wheel
run: |
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,20 @@ jobs:
run: |
ci/runtests.sh

- name: Python 3.10 (amd64)
env:
PYTHON: "py -3.10-64"
shell: bash
run: |
ci/runtests.sh

- name: Python 3.10 (x86)
env:
PYTHON: "py -3.10-32"
shell: bash
run: |
ci/runtests.sh

- name: Upload Wheels
uses: actions/upload-artifact@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ update-docker:

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

.PHONY: linux-arm64-wheel
linux-arm64-wheel:
Expand Down
4 changes: 3 additions & 1 deletion docker/buildwheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ set -e -x
ARCH=`uname -p`
echo "arch=$ARCH"

ls /opt/python

for V in "${PYTHON_VERSIONS[@]}"; do
PYBIN=/opt/python/$V/bin
rm -rf build/ # Avoid lib build by narrow Python is used by wide python
$PYBIN/python setup.py bdist_wheel
$PYBIN/python -m build -w
done

cd dist
Expand Down
2 changes: 1 addition & 1 deletion docker/shared.env
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PYTHON_VERSIONS=(
cp310-cp310
cp39-cp39
cp38-cp38
cp37-cp37m
cp36-cp36m
cp35-cp35m
)
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,12 @@ def __init__(self, *args, **kwargs):
},
license="Apache 2.0",
classifiers=[
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
"Intended Audience :: Developers",
Expand Down