Skip to content

Commit 64e5244

Browse files
committed
chore: drop support for manylinux2010 binary wheels (#2137)
* 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
1 parent 36b31d3 commit 64e5244

File tree

4 files changed

+25
-30
lines changed

4 files changed

+25
-30
lines changed

.coveragerc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[run]
22
branch = True
33
source = falcon
4-
omit = falcon/tests*,falcon/cmd/bench.py,falcon/bench*,falcon/vendor/*
4+
omit = falcon/tests*,falcon/cmd/bench.py,falcon/bench/*,falcon/vendor/*
55

66
parallel = True
77

.github/workflows/create-wheels.yaml

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -126,24 +126,8 @@ jobs:
126126
python-version: ${{ steps.linux-py-version.outputs.python-version }}
127127
architecture: ${{ matrix.architecture }}
128128

129-
- name: Create wheel for manylinux 2010 and 1
130-
# this step uses the image provided by pypa here https://github.com/pypa/manylinux to generate the wheels on linux
131-
# the action uses the image for manylinux2010 but can generate also a manylinux1 wheel
132-
# change the tag of this image to change the image used
133-
uses: RalfG/python-wheels-manylinux-build@v0.5.0-manylinux2010_x86_64
134-
# this action generates 3 wheels in dist/. linux manylinux1 and manylinux2010
135-
# TODO(vytas): Drop manylinux 2010 support for all wheels:
136-
# https://github.com/pypa/manylinux/issues/1281#
137-
if: ${{ matrix.python-version != 'cp311-cp311' }}
138-
with:
139-
python-versions: ${{ matrix.python-version }}
140-
build-requirements: "setuptools>=47 wheel>=0.34"
141-
# `--no-deps` is used to only generate the wheel for the current library. Redundant in falcon since it has no dependencies
142-
pip-wheel-args: "-w ./dist -v --no-deps"
143-
144129
- name: Create wheel for manylinux 2014
145-
# as previous step but for manylinux2014
146-
uses: RalfG/python-wheels-manylinux-build@v0.5.0-manylinux2014_x86_64
130+
uses: RalfG/python-wheels-manylinux-build@v0.6.0-manylinux2014_x86_64
147131
# this action generates 2 wheels in dist/. linux, manylinux2014
148132
with:
149133
# Remove previous original wheel just to be sure it is recreated. Should not be needed
@@ -270,8 +254,8 @@ jobs:
270254
271255
- name: Create wheel for manylinux 2014 for arm
272256
if: ${{ matrix.architecture == 'aarch64' }}
273-
uses: RalfG/python-wheels-manylinux-build@v0.5.0-manylinux2014_aarch64
274-
# this action generates 2 wheels in dist/. linux manylinux1 and manylinux2010
257+
uses: RalfG/python-wheels-manylinux-build@v0.6.0-manylinux2014_aarch64
258+
# this action generates 2 wheels in dist/. linux, manylinux2014
275259
with:
276260
python-versions: ${{ matrix.python-version }}
277261
build-requirements: "setuptools>=47 wheel>=0.34"
@@ -293,8 +277,8 @@ jobs:
293277
294278
- name: Create wheel for manylinux 2014 for s390x
295279
if: ${{ matrix.architecture == 's390x' }}
296-
uses: RalfG/python-wheels-manylinux-build@v0.5.0-manylinux2014_s390x
297-
# this action generates 2 wheels in dist/. linux manylinux1 and manylinux2010
280+
uses: RalfG/python-wheels-manylinux-build@v0.6.0-manylinux2014_s390x
281+
# this action generates 2 wheels in dist/. linux, manylinux2014
298282
with:
299283
python-versions: ${{ matrix.python-version }}
300284
build-requirements: "setuptools>=47 wheel>=0.34"

.github/workflows/tests.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ jobs:
6969
- python-version: "3.10"
7070
os: ubuntu-latest
7171
toxenv: py310_cython
72-
- python-version: "3.11.0-rc - 3.11"
72+
- python-version: "3.11"
7373
os: ubuntu-latest
7474
toxenv: py311
75-
- python-version: "3.11.0-rc - 3.11"
75+
- python-version: "3.11"
7676
os: ubuntu-latest
7777
toxenv: py311_cython
7878
- python-version: "3.10"
@@ -81,12 +81,12 @@ jobs:
8181
- python-version: "3.10"
8282
os: windows-latest
8383
toxenv: py310_nocover
84-
# These env require 3.8, see tox.ini
84+
# These env require 3.8 and 20.04, see tox.ini
8585
- python-version: "3.8"
86-
os: ubuntu-latest
86+
os: ubuntu-20.04
8787
toxenv: py38_smoke
8888
- python-version: "3.8"
89-
os: ubuntu-latest
89+
os: ubuntu-20.04
9090
toxenv: py38_smoke_cython
9191
- python-version: "3.8"
9292
os: ubuntu-latest

tox.ini

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,7 @@ commands = falcon-bench []
358358

359359
[testenv:check_vendored]
360360
basepython = python3.10
361+
allowlist_externals = {toxinidir}/tools/check-vendored.sh
361362
deps =
362363
commands = {toxinidir}/tools/check-vendored.sh
363364

@@ -390,15 +391,25 @@ deps = -r{toxinidir}/requirements/docs
390391
toml
391392
towncrier
392393
commands =
393-
{toxinidir}/tools/towncrier_draft.py --dry-run
394+
python "{toxinidir}/tools/towncrier_draft.py" --dry-run
394395

395396
[testenv:changelog_release]
396397
deps = -r{toxinidir}/requirements/docs
397398
toml
398399
towncrier
399400
commands =
400-
{toxinidir}/tools/add_contributors.py
401-
{toxinidir}/tools/towncrier_draft.py
401+
python "{toxinidir}/tools/add_contributors.py"
402+
python "{toxinidir}/tools/towncrier_draft.py"
403+
404+
# NOTE(kgriffs): Renders the changelog to HTML so that the final result
405+
# can be previewed, but then restores the changelog RST document.
406+
[testenv:changelog_draft]
407+
deps = -r{toxinidir}/requirements/docs
408+
toml
409+
towncrier
410+
commands =
411+
python "{toxinidir}/tools/add_contributors.py" --dry-run
412+
python "{toxinidir}/tools/towncrier_draft.py" --dry-run
402413

403414
[testenv:dash]
404415
basepython = python3.10

0 commit comments

Comments
 (0)