From 6b6242edfe1b8f0bdd6b73b2b44ae813d85c8ff3 Mon Sep 17 00:00:00 2001 From: Vytautas Liuolia Date: Wed, 10 Apr 2024 07:21:05 +0200 Subject: [PATCH 1/3] chore: make CPython 3.12 default CI version --- .github/workflows/tests.yaml | 8 ++++---- CONTRIBUTING.md | 2 +- docs/changes/4.0.0.rst | 2 +- tox.ini | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 6a0ddbe40..caf9c5cc9 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: python-version: - - "3.10" + - "3.12" os: - "ubuntu-latest" toxenv: @@ -28,9 +28,9 @@ jobs: - "pep8-docstrings" - "mypy" - "mypy_tests" - - "py310" - - "py310_sans_msgpack" - - "py310_cython" + - "py312" + - "py312_sans_msgpack" + - "py312_cython" - "docs" - "towncrier" - "look" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2e3d8082f..b28054167 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -37,7 +37,7 @@ $ pip install -U blue $ blue . ``` -You can check all this by running ``tox`` from within the Falcon project directory. Your environment must be based on CPython 3.8, 3.10 or 3.11: +You can check all this by running ``tox`` from within the Falcon project directory. Your environment must be based on CPython 3.8, 3.10, 3.11 or 3.12: ```bash $ pip install -U tox diff --git a/docs/changes/4.0.0.rst b/docs/changes/4.0.0.rst index 93359c678..361c17619 100644 --- a/docs/changes/4.0.0.rst +++ b/docs/changes/4.0.0.rst @@ -13,7 +13,7 @@ Changes to Supported Platforms ------------------------------ - CPython 3.11 is now fully supported. (`#2072 `__) -- CPython 3.12 will be fully supported. (`#2196 `__) +- CPython 3.12 is now fully supported. (`#2196 `__) - End-of-life Python 3.5 & 3.6 are no longer supported. (`#2074 `__) - Python 3.7 is no longer actively supported, but the framework should still continue to install from source. We may remove the support for 3.7 altogether diff --git a/tox.ini b/tox.ini index 1715258c5..67d9d7c7d 100644 --- a/tox.ini +++ b/tox.ini @@ -99,21 +99,21 @@ deps = {[testenv]deps} commands = pip uninstall --yes msgpack coverage run -m pytest tests -k "test_ws and test_msgpack_missing" -[testenv:py310] -basepython = python3.10 +[testenv:py312] +basepython = python3.12 deps = {[testenv]deps} pytest-randomly jsonschema commands = {[with-coverage]commands} -[testenv:py310_sans_msgpack] -basepython = python3.10 +[testenv:py312_sans_msgpack] +basepython = python3.12 deps = {[testenv]deps} commands = pip uninstall --yes msgpack coverage run -m pytest tests -k "test_ws and test_msgpack_missing" -[testenv:py310_nocover] -basepython = python3.10 +[testenv:py312_nocover] +basepython = python3.12 deps = {[testenv]deps} pytest-randomly jsonschema From bc827f385adf96e66d528bef23db1efef6cf7aae Mon Sep 17 00:00:00 2001 From: Vytautas Liuolia Date: Wed, 10 Apr 2024 07:31:14 +0200 Subject: [PATCH 2/3] chore(CI): update forgotten Windows, macOS & cov gates --- .github/workflows/tests.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index caf9c5cc9..e7eb66fe3 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -82,12 +82,12 @@ jobs: - python-version: "3.12" os: ubuntu-latest toxenv: py312_cython - - python-version: "3.10" + - python-version: "3.12" os: macos-latest - toxenv: py310_nocover - - python-version: "3.10" + toxenv: py312_nocover + - python-version: "3.12" os: windows-latest - toxenv: py310_nocover + toxenv: py312_nocover # These env require 3.8 and 20.04, see tox.ini - python-version: "3.8" os: ubuntu-20.04 @@ -133,14 +133,14 @@ jobs: run: tox -e ${{ matrix.toxenv }} - name: Combine coverage - if: ${{ matrix.toxenv == 'py310' || matrix.toxenv == 'py310_sans_msgpack' }} + if: ${{ matrix.toxenv == 'py312' || matrix.toxenv == 'py312_sans_msgpack' }} run: | coverage --version coverage combine - name: Upload coverage to Codecov uses: codecov/codecov-action@v1 - if: ${{ matrix.toxenv == 'py310' || matrix.toxenv == 'py310_sans_msgpack' }} + if: ${{ matrix.toxenv == 'py312' || matrix.toxenv == 'py312_sans_msgpack' }} with: env_vars: PYTHON fail_ci_if_error: true From b1a5aaf4b239e96cd1f6e1daf65de36f87bd7f03 Mon Sep 17 00:00:00 2001 From: Vytautas Liuolia Date: Wed, 10 Apr 2024 07:46:53 +0200 Subject: [PATCH 3/3] chore: try codecov v4 --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index e7eb66fe3..cdb9d9cfd 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -139,7 +139,7 @@ jobs: coverage combine - name: Upload coverage to Codecov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v4 if: ${{ matrix.toxenv == 'py312' || matrix.toxenv == 'py312_sans_msgpack' }} with: env_vars: PYTHON