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

Add support for Python 3.10 #472

Merged
merged 5 commits into from Sep 6, 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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/deploy-wheels.yml
Expand Up @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest, macOS-latest]
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10-dev"]
include:
- os: ubuntu-latest
python-version: 3.8
Expand Down Expand Up @@ -70,8 +70,8 @@ jobs:
- name: Build x86 Linux wheels
if: matrix.wheel == 'x86'
run: |
docker run -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/scripts/build-manylinux-wheels.sh
docker run -v `pwd`:/io quay.io/pypa/manylinux1_i686 /io/scripts/build-manylinux-wheels.sh
docker run -v `pwd`:/io quay.io/pypa/manylinux2014_x86_64 /io/scripts/build-manylinux-wheels.sh
docker run -v `pwd`:/io quay.io/pypa/manylinux2014_i686 /io/scripts/build-manylinux-wheels.sh

- name: Upload as build artifacts
uses: actions/upload-artifact@v2
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/test.yml
Expand Up @@ -8,14 +8,10 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ "3.6", "3.7", "3.8", "3.9"]
os: [ubuntu-18.04, ubuntu-16.04, macos-latest, windows-2019]
include:
# PyPy3
- { python-version: "pypy3", os: ubuntu-18.04 }
- { python-version: "pypy3", os: ubuntu-16.04 }
# Dev versions
- { python-version: "3.10-dev", os: ubuntu-20.04 }
python-version: [ "3.6", "3.7", "3.8", "3.9", "3.10-dev", "pypy3"]
os: [ubuntu-20.04, ubuntu-18.04, macos-latest, windows-2019]
exclude:
- { python-version: "pypy3", os: macos-latest }

steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions scripts/build-manylinux-wheels.sh
Expand Up @@ -4,11 +4,11 @@ set -e -x
# This is to be run by Docker inside a Docker image.
# You can test it locally on a Linux machine by installing Docker and running from this
# repo's root:
# $ docker run -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/scripts/build-manylinux-wheels.sh
# $ docker run -v `pwd`:/io quay.io/pypa/manylinux2014_x86_64 /io/scripts/build-manylinux-wheels.sh

# The -v gives a directory alias for passing files in and out of the Docker.
# (/io is arbitrary). E.g the setup.py script can be accessed in the Docker via
# /io/setup.py quay.io/pypa/manylinux1_x86_64 is the full Docker image name. Docker
# /io/setup.py quay.io/pypa/manylinux2014_x86_64 is the full Docker image name. Docker
# downloads it automatically.

# The last argument is a shell command that the Docker will execute. Filenames must be
Expand All @@ -22,7 +22,7 @@ mkdir -p /io/temp-wheels
# Clean out any old existing wheels.
find /io/temp-wheels/ -type f -delete

for PYBIN in /opt/python/cp3[6789]*/bin; do
for PYBIN in /opt/python/cp3[678910]*/bin; do
"${PYBIN}/pip" install -q -U setuptools wheel pytest --cache-dir /io/pip-cache
(cd /io/ && "${PYBIN}/python" -m pip install .)
(cd /io/ && "${PYBIN}/python" -m pytest)
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-manylinux.py
Expand Up @@ -37,7 +37,7 @@ def main():
# so files are not root-owned
"--user", f"{os.getuid()}:{os.getgid()}",
"--volume", f'{os.path.abspath("dist")}:/dist:rw',
"quay.io/pypa/manylinux1_x86_64:latest",
"quay.io/pypa/manylinux2014_x86_64:latest",
"bash", "-euxc",
f"{pip} wheel -w /tmp/wheels --no-deps {pkg} && "
f"auditwheel repair -w /dist /tmp/wheels/*.whl",
Expand Down
1 change: 1 addition & 0 deletions setup.py
Expand Up @@ -12,6 +12,7 @@
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3 :: Only
"""

Expand Down