From f094355401e4a5f1ddf40ba816705e43e06b6dfc Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Thu, 16 Dec 2021 10:37:52 -0300 Subject: [PATCH] Merge pull request #9417 from nicoddemus/fix-py3.10.1-9413 --- .github/workflows/main.yml | 4 ++-- testing/test_skipping.py | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 92e2dc6be..bbc48adb4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -78,7 +78,7 @@ jobs: os: windows-latest tox_env: "py39-xdist" - name: "windows-py310" - python: "3.10-dev" + python: "3.10.1" os: windows-latest tox_env: "py310-xdist" @@ -108,7 +108,7 @@ jobs: os: ubuntu-latest tox_env: "py39-xdist" - name: "ubuntu-py310" - python: "3.10-dev" + python: "3.10.1" os: ubuntu-latest tox_env: "py310-xdist" - name: "ubuntu-pypy3" diff --git a/testing/test_skipping.py b/testing/test_skipping.py index a0b5cddab..301094360 100644 --- a/testing/test_skipping.py +++ b/testing/test_skipping.py @@ -1143,8 +1143,6 @@ def test_errors_in_xfail_skip_expressions(pytester: Pytester) -> None: pypy_version_info = getattr(sys, "pypy_version_info", None) if pypy_version_info is not None and pypy_version_info < (6,): markline = markline[5:] - elif sys.version_info[:2] >= (3, 10): - markline = markline[11:] elif sys.version_info >= (3, 8) or hasattr(sys, "pypy_version_info"): markline = markline[4:]