diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d56e01e..c1f1a61 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,10 +10,8 @@ jobs: strategy: fail-fast: false matrix: - python: ["3.6", "3.7", "3.8", "3.9", "3.10"] + python: ["3.7", "3.8", "3.9", "3.10", "3.11"] include: - - python: "3.6" - tox_env: "py36" - python: "3.7" tox_env: "py37" - python: "3.8" @@ -22,6 +20,8 @@ jobs: tox_env: "py39" - python: "3.10" tox_env: "py310" + - python: "3.11" + tox_env: "py311" steps: - uses: actions/checkout@v1 diff --git a/setup.py b/setup.py index 03233ee..23f4a8a 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ zip_safe=False, install_requires=["py", "pytest>=3.10"], setup_requires=["setuptools_scm"], - python_requires=">=3.6", + python_requires=">=3.7", classifiers=[ "Development Status :: 7 - Inactive", "Framework :: Pytest", @@ -34,11 +34,11 @@ "Topic :: Utilities", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3 :: Only", ], ) diff --git a/testing/test_xfail_behavior.py b/testing/test_xfail_behavior.py index ef00385..15edd93 100644 --- a/testing/test_xfail_behavior.py +++ b/testing/test_xfail_behavior.py @@ -6,6 +6,7 @@ IS_PYTEST4_PLUS = int(pytest.__version__[0]) >= 4 # noqa: WPS609 FAILED_WORD = "FAILED" if IS_PYTEST4_PLUS else "FAIL" +PYTEST_GTE_7_2 = hasattr(pytest, "version_tuple") and pytest.version_tuple >= (7, 2) # type: ignore[attr-defined] pytestmark = pytest.mark.skipif( # pylint: disable=invalid-name not hasattr(os, "fork"), # noqa: WPS421 @@ -66,10 +67,12 @@ def test_xfail(is_crashing, is_strict, testdir): ) ) reason_string = ( - f" reason: The process gets terminated; " + f"reason: The process gets terminated; " f"pytest-forked reason: " f"*:*: running the test CRASHED with signal {sig_num:d}" ) + if expected_lowercase == "xfailed" and PYTEST_GTE_7_2: + short_test_summary += " - " + reason_string total_summary_line = f"*==== 1 {expected_lowercase!s} in 0.*s* ====*" expected_lines = ( @@ -91,7 +94,7 @@ def test_xfail(is_crashing, is_strict, testdir): ) if expected_lowercase == "xpassed" and expected_word == FAILED_WORD: # XPASS(strict) - expected_lines += (reason_string,) + expected_lines += (" " + reason_string,) expected_lines += (total_summary_line,) test_module = testdir.makepyfile( diff --git a/tox.ini b/tox.ini index 797b44d..ae49715 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ minversion = 3.7.0 isolated_build = true envlist= - py{36,37,38,39,310}-pytest{310,46,54,62,latest} + py{37,38,39,310,311}-pytest{310,46,54,62,latest} flakes build-dists metadata-validation