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 and musl-based runtimes #629

Merged
merged 16 commits into from
Oct 1, 2021
29 changes: 15 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ on:
push:
branches:
- master
- '[0-9].[0-9]+' # matches to backport branches, e.g. 3.6
- '[0-9].[0-9]+' # matches to backport branches, e.g. 3.6
tags: [ 'v*' ]
pull_request:
branches:
- master
- '[0-9].[0-9]+' # matches to backport branches, e.g. 3.6
- '[0-9].[0-9]+' # matches to backport branches, e.g. 3.6
schedule:
- cron: '0 6 * * *' # Daily 6AM UTC build


jobs:

Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
needs: lint
strategy:
matrix:
pyver: [3.6, 3.7, 3.8, 3.9]
pyver: [3.6, 3.7, 3.8, 3.9, 3.10.0-rc.2]
no-extensions: ['', 'Y']
os: [ubuntu, macos, windows]
exclude:
Expand Down Expand Up @@ -134,10 +134,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2.3.4
- name: Setup Python 3.8
- name: Setup Python 3.9
uses: actions/setup-python@v2.2.2
with:
python-version: 3.8
python-version: 3.9
asvetlov marked this conversation as resolved.
Show resolved Hide resolved
- name: Make sdist
run:
python setup.py sdist
Expand All @@ -151,13 +151,14 @@ jobs:
name: Linux
strategy:
matrix:
pyver: [cp36-cp36m, cp37-cp37m, cp38-cp38, cp39-cp39]
pyver: [cp36-cp36m, cp37-cp37m, cp38-cp38, cp39-cp39, cp310-cp310]
arch: [x86_64, aarch64, i686, ppc64le, s390x]
img_pre: [manylinux_2_24, musllinux_1_1]
fail-fast: false
runs-on: ubuntu-latest
env:
py: /opt/python/${{ matrix.pyver }}/bin/python
img: quay.io/pypa/manylinux2014_${{ matrix.arch }}
img: quay.io/pypa/${{ matrix.img_pre }}_${{ matrix.arch }}
needs: pre-deploy
steps:
- name: Checkout
Expand All @@ -184,12 +185,12 @@ jobs:
with:
name: dist
path: wheelhouse/*

build-binary:
name: Binary wheels
strategy:
matrix:
pyver: [3.6, 3.7, 3.8, 3.9]
pyver: [3.6, 3.7, 3.8, 3.9, 3.10.0-rc.2]
os: [macos, windows]
arch: [x86, x64]
exclude:
Expand All @@ -201,14 +202,14 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2.3.4
- name: Setup Python 3.8
- name: Setup Python 3.9
uses: actions/setup-python@v2.2.2
with:
python-version: ${{ matrix.pyver }}
architecture: ${{ matrix.arch }}
- name: Install dependencies
run: |
python -m pip install -U setuptools wheel
python -m pip install -U setuptools wheel
- name: Make wheel
run:
python setup.py bdist_wheel
Expand All @@ -223,10 +224,10 @@ jobs:
needs: [build-linux, build-binary, build-tarball]
runs-on: ubuntu-latest
steps:
- name: Setup Python 3.8
- name: Setup Python 3.9
uses: actions/setup-python@v2.2.2
with:
python-version: 3.8
python-version: 3.9
- name: Install twine
run: |
python -m pip install twine
Expand Down
1 change: 1 addition & 0 deletions CHANGES/629.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Support Python 3.10, build Linux Alpine images
asvetlov marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion multidict/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"getversion",
)

__version__ = "5.1.0"
__version__ = "5.2.0a0"


try:
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ def read(f):
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Development Status :: 5 - Production/Stable",
],
author="Andrew Svetlov",
Expand Down