Skip to content

Commit

Permalink
Add Python 3.12 to supported versions
Browse files Browse the repository at this point in the history
- also add pypy-3.9 and pypy-3.10 to CI
  • Loading branch information
mrbean-bremen committed Nov 18, 2023
1 parent ee5c2fc commit edc0aaa
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 17 deletions.
18 changes: 11 additions & 7 deletions .github/workflows/pythontests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,14 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "pypy-3.7"]
exclude:
- os: windows-latest
python-version: "pypy-3.7"
python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
include:
- python-version: "pypy-3.7"
os: ubuntu-latest
- python-version: "pypy-3.9"
os: ubuntu-latest
- python-version: "pypy-3.10"
os: ubuntu-latest
env:
OS: ${{ matrix.os }}
steps:
Expand All @@ -42,11 +46,11 @@ jobs:
python -m pip install pytest pytest-cov tox
- name: Run tests
run: |
TOX_PYTHON_VERSION=$(if [ ${{ matrix.python-version }} = pypy-3.7 ]; then echo "pypy3"; else echo py${{ matrix.python-version }} | tr -d .-; fi)
COV_CMD=$(if [ ${{ matrix.python-version }} = 3.8 ]; then echo "--cov=./pytest_order/ --cov-report=xml"; else echo ; fi) tox -e $(tox -l | grep $TOX_PYTHON_VERSION | paste -sd "," -)
TOX_PYTHON_VERSION=$(if [[ ${{ matrix.python-version }} == pypy* ]]; then echo ${{ matrix.python-version }} | tr -d .-; else echo py${{ matrix.python-version }} | tr -d .-; fi)
COV_CMD=$(if [ ${{ matrix.python-version }} == 3.10 ]; then echo "--cov=./pytest_order/ --cov-report=xml"; else echo ; fi) tox -e $(tox -l | grep "$TOX_PYTHON_VERSION" | paste -sd "," -)
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
if: ${{ success() && matrix.python-version == 3.8 }}
if: ${{ success() && matrix.python-version == 3.10 }}
with:
env_vars: OS
name: codecov-pytest-order
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
# pytest-order Release Notes

## [Version 1.2.0](https://pypi.org/project/pytest-order/1.2.0/) (2023-11-18)
Allows using custom markers for ordering.

### New features
* added option `--order-marker-prefix` to allow using custom markers for ordering

### Infrastructure
* added pre-commit hook for linters
- added pre-commit hook for linters
- added Python 3.12 to supported versions

## [Version 1.1.0](https://pypi.org/project/pytest-order/1.1.0/) (2023-03-10)
Adds support for executing tests more than once using order marks.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ relationship to other tests.
[pytest-ordering](https://github.com/ftobia/pytest-ordering) that provides
additional features like ordering relative to other tests.

`pytest-order` works with Python 3.7 - 3.11, with pytest
`pytest-order` works with Python 3.7 - 3.12, with pytest
versions >= 5.0.0 for all versions up to Python 3.9, and for pytest >=
6.2.4 for Python 3.10 and 3.11. `pytest-order` runs on Linux, macOS and Windows.
6.2.4 for Python >= 3.10. `pytest-order` runs on Linux, macOS and Windows.

Documentation
-------------
Expand Down
4 changes: 2 additions & 2 deletions docs/source/intro.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ ordering, all configuration options) that are not available in

Supported Python and pytest versions
------------------------------------
``pytest-order`` supports python 3.7 - 3.11 and pypy3, and is
``pytest-order`` supports python 3.7 - 3.12 and pypy3, and is
compatible with pytest 5.0.0 or newer (older versions may also work, but are
not tested) for Python versions up to 3.9, and with pytest >= 6.2.4 for
Python 3.10 and 3.11.
Python versions >= 3.10.

All supported combinations of Python and pytest versions are tested in
the CI builds. The plugin shall work under Linux, MacOs and Windows.
Expand Down
2 changes: 1 addition & 1 deletion pytest_order/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.2.dev0"
__version__ = "1.2.0"
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
Expand Down
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tox]
envlist =
{py37,py38,py39,pypy3}-pytest{50,51,52,53,54,60,61,62,70,72}
{py310,py311}-pytest{624,70,72}
{py37,py38,py39,pypy37,pypy39}-pytest{50,51,52,53,54,60,61,62,70,73}
{py310,py311,py312,pypy310}-pytest{624,70,73}
[testenv]
deps =
pytest50: pytest>=5.0,<5.1
Expand All @@ -14,10 +14,10 @@ deps =
pytest62: pytest>=6.2,<6.3
pytest624: pytest>=6.2.4,<6.3
pytest70: pytest>=7.0,<7.1
pytest72: pytest>=7.2,<7.3
pytest73: pytest>=7.3,<7.4
pytest-cov<2.10
pytest{50,51,52,53,54}: pytest-xdist<2.0.0
pytest{60,61,62,624,70,72}: pytest-xdist
pytest{60,61,62,624,70,73}: pytest-xdist
pytest-dependency>=0.5.1
pytest-mock

Expand Down

0 comments on commit edc0aaa

Please sign in to comment.