diff options
Diffstat (limited to 'main/py3-pytest/0003-fix-test_errors_in_xfail_skip_expressions.patch')
-rw-r--r-- | main/py3-pytest/0003-fix-test_errors_in_xfail_skip_expressions.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/main/py3-pytest/0003-fix-test_errors_in_xfail_skip_expressions.patch b/main/py3-pytest/0003-fix-test_errors_in_xfail_skip_expressions.patch deleted file mode 100644 index ff90a16d6ee..00000000000 --- a/main/py3-pytest/0003-fix-test_errors_in_xfail_skip_expressions.patch +++ /dev/null @@ -1,50 +0,0 @@ -Patch-Source: https://github.com/pytest-dev/pytest/commit/913439f5e5691f391e2969b3c8f0a49e50dce43a -From 913439f5e5691f391e2969b3c8f0a49e50dce43a Mon Sep 17 00:00:00 2001 -From: Bruno Oliveira <nicoddemus@gmail.com> -Date: Thu, 16 Dec 2021 09:07:14 -0300 -Subject: [PATCH] Fix test_errors_in_xfail_skip_expressions for Python 3.10.1 - -Decided to remove the condition altogether as seems reasonable to state -that our own test suite requires Python 3.10.1. - -Fix #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 92e2dc6be7..bbc48adb49 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 a0b5cddabc..3010943607 100644 ---- a/testing/test_skipping.py -+++ b/testing/test_skipping.py -@@ -1143,8 +1143,6 @@ def test_func(): - 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:] - |