diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /dev-python/pytest/files | |
parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) |
gentoo resync : 20.03.2022
Diffstat (limited to 'dev-python/pytest/files')
-rw-r--r-- | dev-python/pytest/files/pytest-6.2.5-py310.patch | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/dev-python/pytest/files/pytest-6.2.5-py310.patch b/dev-python/pytest/files/pytest-6.2.5-py310.patch deleted file mode 100644 index 89ca41954273..000000000000 --- a/dev-python/pytest/files/pytest-6.2.5-py310.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 5082686349185ef35f64d1a998a3062ee5a48771 Mon Sep 17 00:00:00 2001 -From: Ran Benita <ran@unusedvar.com> -Date: Thu, 13 May 2021 17:27:43 +0300 -Subject: [PATCH 1/2] Merge pull request #8664 from - hroncok/test_unittest-ignore_DeprecationWarning-from-twisted - -Ignore DeprecationWarnings in test_trial_error - -(cherry picked from commit 850a8447792f89c7d38c72b2f542536655ab0354) ---- - testing/test_unittest.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/testing/test_unittest.py b/testing/test_unittest.py -index 8b00cb826..de8fc5c55 100644 ---- a/testing/test_unittest.py -+++ b/testing/test_unittest.py -@@ -533,7 +533,9 @@ class TestTrialUnittest: - # will crash both at test time and at teardown - """ - ) -- result = testdir.runpytest("-vv", "-oconsole_output_style=classic") -+ result = testdir.runpytest( -+ "-vv", "-oconsole_output_style=classic", "-W", "ignore::DeprecationWarning" -+ ) - result.stdout.fnmatch_lines( - [ - "test_trial_error.py::TC::test_four FAILED", --- -2.35.0 - -From 932792c22a300fc7794f966851df2b996f4a79bc Mon Sep 17 00:00:00 2001 -From: Bruno Oliveira <nicoddemus@gmail.com> -Date: Thu, 16 Dec 2021 10:37:52 -0300 -Subject: [PATCH 2/2] Merge pull request #9417 from - nicoddemus/fix-py3.10.1-9413 - -(cherry picked from commit 47df71d23ff13bd083b21ffcf839bd11169b42fc) ---- - .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 5a9435357..a8a6406c6 100644 ---- a/.github/workflows/main.yml -+++ b/.github/workflows/main.yml -@@ -75,7 +75,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" - -@@ -105,7 +105,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 3cb8bdff2..487793645 100644 ---- a/testing/test_skipping.py -+++ b/testing/test_skipping.py -@@ -1126,8 +1126,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:] - --- -2.35.0 - |