From 64e5244ebb89e69164337c1cbfab67ee2410f909 Mon Sep 17 00:00:00 2001 From: Vytautas Liuolia Date: Sun, 8 Jan 2023 13:41:07 +0100 Subject: [PATCH] chore: drop support for `manylinux2010` binary wheels (#2137) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- .coveragerc | 2 +- .github/workflows/create-wheels.yaml | 26 +++++--------------------- .github/workflows/tests.yaml | 10 +++++----- tox.ini | 17 ++++++++++++++--- 4 files changed, 25 insertions(+), 30 deletions(-) diff --git a/.coveragerc b/.coveragerc index 66b302d81..32235c156 100644 --- a/.coveragerc +++ b/.coveragerc @@ -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 diff --git a/.github/workflows/create-wheels.yaml b/.github/workflows/create-wheels.yaml index f7e332cf6..a82642075 100644 --- a/.github/workflows/create-wheels.yaml +++ b/.github/workflows/create-wheels.yaml @@ -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/python-wheels-manylinux-build@v0.5.0-manylinux2010_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/python-wheels-manylinux-build@v0.5.0-manylinux2014_x86_64 + uses: RalfG/python-wheels-manylinux-build@v0.6.0-manylinux2014_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 @@ -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" @@ -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" diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 3523bc0a8..b415c0e7f 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -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" @@ -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 diff --git a/tox.ini b/tox.ini index 95a04c6c3..286c89fd5 100644 --- a/tox.ini +++ b/tox.ini @@ -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 @@ -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