From 0ab1805ee463feec5c393ee4ba1c0fa4f18162ea Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Wed, 15 Sep 2021 18:00:42 +0300 Subject: [PATCH 1/4] Add support for Python 3.10 --- .github/workflows/test.yml | 1 + README.rst | 2 +- setup.cfg | 1 + tox.ini | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ff50f1f..b0d3bd0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,6 +26,7 @@ jobs: "3.7", "3.8", "3.9", + "3.10-dev", "pypy3", ] pytest-version: [ diff --git a/README.rst b/README.rst index f224de6..50d4de4 100644 --- a/README.rst +++ b/README.rst @@ -19,7 +19,7 @@ Requirements You will need the following prerequisites in order to use pytest-rerunfailures: -- Python 3.6, up to 3.9, or PyPy3 +- Python 3.6, up to 3.10, or PyPy3 - pytest 5.3 or newer This package is currently tested against the last 5 minor pytest releases. In diff --git a/setup.cfg b/setup.cfg index 02a81a0..837e438 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,6 +31,7 @@ classifiers = Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 Programming Language :: Python :: 3 :: Only Programming Language :: Python :: Implementation :: CPython Programming Language :: Python :: Implementation :: PyPy diff --git a/tox.ini b/tox.ini index 294f056..270c62c 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ max-line-length = 88 [tox] envlist = linting - py{36,37,38,39,py3}-pytest{53,54,60,61,62} + py{36,37,38,39,310,py3}-pytest{53,54,60,61,62} minversion = 3.17.1 [testenv] From 365078d69738b383840464a7df62be83337aba35 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Wed, 15 Sep 2021 18:40:11 +0300 Subject: [PATCH 2/4] Only pylast 6.2+ supports Python 3.10 --- .github/workflows/test.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b0d3bd0..b4614e9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,6 +37,12 @@ jobs: "6.2.*", "main", ] + exclude: + # Only pylast 6.2+ supports Python 3.10 + - { python-version: "3.10-dev", pytest-version: "5.3.*" } + - { python-version: "3.10-dev", pytest-version: "5.4.*" } + - { python-version: "3.10-dev", pytest-version: "6.0.*" } + - { python-version: "3.10-dev", pytest-version: "6.1.*" } steps: - uses: actions/checkout@v2 From 95bf03280824582df4989aca53d337044f9a6a21 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Thu, 16 Sep 2021 08:28:26 +0200 Subject: [PATCH 3/4] Fix tox.ini: * Run Python 3.10 only against 6.2.* and main * Run other Python versions against main, too. --- .github/workflows/test.yml | 2 +- tox.ini | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b4614e9..60bcb40 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,7 +38,7 @@ jobs: "main", ] exclude: - # Only pylast 6.2+ supports Python 3.10 + # Only pytest 6.2+ supports Python 3.10 - { python-version: "3.10-dev", pytest-version: "5.3.*" } - { python-version: "3.10-dev", pytest-version: "5.4.*" } - { python-version: "3.10-dev", pytest-version: "6.0.*" } diff --git a/tox.ini b/tox.ini index 270c62c..0def678 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,8 @@ max-line-length = 88 [tox] envlist = linting - py{36,37,38,39,310,py3}-pytest{53,54,60,61,62} + py{36,37,38,39,py3}-pytest{53,54,60,61,62,main} + py310-pytest{62,main} minversion = 3.17.1 [testenv] From 04ccfe5d1ee84a4d4ec88ee31087a774e8c76096 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Thu, 16 Sep 2021 08:45:42 +0200 Subject: [PATCH 4/4] Add change log entry. --- CHANGES.rst | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index dcecca9..b660c20 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,7 +4,8 @@ Changelog 10.2 (unreleased) ----------------- -- Nothing changed yet. +- Add support for Python 3.10 (as of Python 3.10.rc2). + (Thanks to `@hugovk `_ for the PR.) 10.1 (2021-07-02) @@ -34,16 +35,16 @@ Features ++++++++ - Add ``condition`` keyword argument to the re-run marker. - (Thanks to `@BeyondEvil`_ for the PR) + (Thanks to `@BeyondEvil`_ for the PR.) - Add support for Python 3.9. - (Thanks to `@digitronik`_ for the PR) + (Thanks to `@digitronik`_ for the PR.) - Add support for pytest 6.3. - (Thanks to `@bluetech`_ for the PR) + (Thanks to `@bluetech`_ for the PR.) - Add compatibility with ``pytest-xdist >= 2.0``. - (Thanks to `@bluetech`_ for the PR) + (Thanks to `@bluetech`_ for the PR.) Other changes +++++++++++++