Skip to content

Commit

Permalink
chore: drop support for manylinux2010 binary wheels (#2137)
Browse files Browse the repository at this point in the history
* chore: drop support for `manylinux2010` binary wheels

* chore: allowlist some externals that got a pass in older `tox`

* chore: more CI fighting 🤜

* chore: simply use 3.11 since I'll need to update branch rules anyway
  • Loading branch information
vytas7 committed Nov 12, 2023
1 parent 36b31d3 commit 64e5244
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[run]
branch = True
source = falcon
omit = falcon/tests*,falcon/cmd/bench.py,falcon/bench*,falcon/vendor/*
omit = falcon/tests*,falcon/cmd/bench.py,falcon/bench/*,falcon/vendor/*

parallel = True

Expand Down
26 changes: 5 additions & 21 deletions .github/workflows/create-wheels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -126,24 +126,8 @@ jobs:
python-version: ${{ steps.linux-py-version.outputs.python-version }}
architecture: ${{ matrix.architecture }}

- name: Create wheel for manylinux 2010 and 1
# this step uses the image provided by pypa here https://github.com/pypa/manylinux to generate the wheels on linux
# the action uses the image for manylinux2010 but can generate also a manylinux1 wheel
# change the tag of this image to change the image used
uses: RalfG/[email protected]_x86_64
# this action generates 3 wheels in dist/. linux manylinux1 and manylinux2010
# TODO(vytas): Drop manylinux 2010 support for all wheels:
# https://github.com/pypa/manylinux/issues/1281#
if: ${{ matrix.python-version != 'cp311-cp311' }}
with:
python-versions: ${{ matrix.python-version }}
build-requirements: "setuptools>=47 wheel>=0.34"
# `--no-deps` is used to only generate the wheel for the current library. Redundant in falcon since it has no dependencies
pip-wheel-args: "-w ./dist -v --no-deps"

- name: Create wheel for manylinux 2014
# as previous step but for manylinux2014
uses: RalfG/[email protected]_x86_64
uses: RalfG/[email protected]_x86_64
# this action generates 2 wheels in dist/. linux, manylinux2014
with:
# Remove previous original wheel just to be sure it is recreated. Should not be needed
Expand Down Expand Up @@ -270,8 +254,8 @@ jobs:
- name: Create wheel for manylinux 2014 for arm
if: ${{ matrix.architecture == 'aarch64' }}
uses: RalfG/python-wheels-manylinux-build@v0.5.0-manylinux2014_aarch64
# this action generates 2 wheels in dist/. linux manylinux1 and manylinux2010
uses: RalfG/python-wheels-manylinux-build@v0.6.0-manylinux2014_aarch64
# this action generates 2 wheels in dist/. linux, manylinux2014
with:
python-versions: ${{ matrix.python-version }}
build-requirements: "setuptools>=47 wheel>=0.34"
Expand All @@ -293,8 +277,8 @@ jobs:
- name: Create wheel for manylinux 2014 for s390x
if: ${{ matrix.architecture == 's390x' }}
uses: RalfG/python-wheels-manylinux-build@v0.5.0-manylinux2014_s390x
# this action generates 2 wheels in dist/. linux manylinux1 and manylinux2010
uses: RalfG/python-wheels-manylinux-build@v0.6.0-manylinux2014_s390x
# this action generates 2 wheels in dist/. linux, manylinux2014
with:
python-versions: ${{ matrix.python-version }}
build-requirements: "setuptools>=47 wheel>=0.34"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ jobs:
- python-version: "3.10"
os: ubuntu-latest
toxenv: py310_cython
- python-version: "3.11.0-rc - 3.11"
- python-version: "3.11"
os: ubuntu-latest
toxenv: py311
- python-version: "3.11.0-rc - 3.11"
- python-version: "3.11"
os: ubuntu-latest
toxenv: py311_cython
- python-version: "3.10"
Expand All @@ -81,12 +81,12 @@ jobs:
- python-version: "3.10"
os: windows-latest
toxenv: py310_nocover
# These env require 3.8, see tox.ini
# These env require 3.8 and 20.04, see tox.ini
- python-version: "3.8"
os: ubuntu-latest
os: ubuntu-20.04
toxenv: py38_smoke
- python-version: "3.8"
os: ubuntu-latest
os: ubuntu-20.04
toxenv: py38_smoke_cython
- python-version: "3.8"
os: ubuntu-latest
Expand Down
17 changes: 14 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ commands = falcon-bench []

[testenv:check_vendored]
basepython = python3.10
allowlist_externals = {toxinidir}/tools/check-vendored.sh
deps =
commands = {toxinidir}/tools/check-vendored.sh

Expand Down Expand Up @@ -390,15 +391,25 @@ deps = -r{toxinidir}/requirements/docs
toml
towncrier
commands =
{toxinidir}/tools/towncrier_draft.py --dry-run
python "{toxinidir}/tools/towncrier_draft.py" --dry-run

[testenv:changelog_release]
deps = -r{toxinidir}/requirements/docs
toml
towncrier
commands =
{toxinidir}/tools/add_contributors.py
{toxinidir}/tools/towncrier_draft.py
python "{toxinidir}/tools/add_contributors.py"
python "{toxinidir}/tools/towncrier_draft.py"

# NOTE(kgriffs): Renders the changelog to HTML so that the final result
# can be previewed, but then restores the changelog RST document.
[testenv:changelog_draft]
deps = -r{toxinidir}/requirements/docs
toml
towncrier
commands =
python "{toxinidir}/tools/add_contributors.py" --dry-run
python "{toxinidir}/tools/towncrier_draft.py" --dry-run

[testenv:dash]
basepython = python3.10
Expand Down

0 comments on commit 64e5244

Please sign in to comment.