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

chore: make CPython 3.12 default CI version #2227

Merged
merged 3 commits into from
Apr 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
python-version:
- "3.10"
- "3.12"
os:
- "ubuntu-latest"
toxenv:
Expand All @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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' }}
uses: codecov/codecov-action@v4
if: ${{ matrix.toxenv == 'py312' || matrix.toxenv == 'py312_sans_msgpack' }}
with:
env_vars: PYTHON
fail_ci_if_error: true
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
vytas7 marked this conversation as resolved.
Show resolved Hide resolved

```bash
$ pip install -U tox
Expand Down
2 changes: 1 addition & 1 deletion docs/changes/4.0.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Changes to Supported Platforms
------------------------------

- CPython 3.11 is now fully supported. (`#2072 <https://github.com/falconry/falcon/issues/2072>`__)
- CPython 3.12 will be fully supported. (`#2196 <https://github.com/falconry/falcon/issues/2196>`__)
- CPython 3.12 is now fully supported. (`#2196 <https://github.com/falconry/falcon/issues/2196>`__)
- End-of-life Python 3.5 & 3.6 are no longer supported. (`#2074 <https://github.com/falconry/falcon/pull/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
Expand Down
12 changes: 6 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading