Skip to content

Support Python 3.11 and remove 3.6 #75

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

Merged
merged 2 commits into from
Dec 8, 2022
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
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
],
)
7 changes: 5 additions & 2 deletions testing/test_xfail_behavior.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 = (
Expand All @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down