- Using URLs for Patches looks like a great idea, but it is too
unstable. Please, don't. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest?expand=0&rev=98
This commit is contained in:
parent
bcc528bda1
commit
3cf985039c
@ -12,11 +12,11 @@ Fix #9413
|
||||
testing/test_skipping.py | 2 --
|
||||
2 files changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
Index: pytest-6.2.5/.github/workflows/main.yml
|
||||
===================================================================
|
||||
--- pytest-6.2.5.orig/.github/workflows/main.yml
|
||||
+++ pytest-6.2.5/.github/workflows/main.yml
|
||||
@@ -75,7 +75,7 @@ jobs:
|
||||
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"
|
||||
@ -25,7 +25,7 @@ Index: pytest-6.2.5/.github/workflows/main.yml
|
||||
os: windows-latest
|
||||
tox_env: "py310-xdist"
|
||||
|
||||
@@ -105,7 +105,7 @@ jobs:
|
||||
@@ -108,7 +108,7 @@ jobs:
|
||||
os: ubuntu-latest
|
||||
tox_env: "py39-xdist"
|
||||
- name: "ubuntu-py310"
|
||||
@ -34,11 +34,11 @@ Index: pytest-6.2.5/.github/workflows/main.yml
|
||||
os: ubuntu-latest
|
||||
tox_env: "py310-xdist"
|
||||
- name: "ubuntu-pypy3"
|
||||
Index: pytest-6.2.5/testing/test_skipping.py
|
||||
===================================================================
|
||||
--- pytest-6.2.5.orig/testing/test_skipping.py
|
||||
+++ pytest-6.2.5/testing/test_skipping.py
|
||||
@@ -1126,8 +1126,6 @@ def test_errors_in_xfail_skip_expression
|
||||
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:]
|
||||
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 20 19:52:39 UTC 2021 - Matej Cepl <mcepl@suse.com>
|
||||
|
||||
- Using URLs for Patches looks like a great idea, but it is too
|
||||
unstable. Please, don't.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Dec 19 14:08:58 UTC 2021 - Ben Greiner <code@bnavigator.de>
|
||||
|
||||
|
@ -44,7 +44,7 @@ Source: https://files.pythonhosted.org/packages/source/p/pytest/pytest-%
|
||||
# PATCH-FIX-UPSTREAM pytest-pr8664-py3.10-test_trial_error-fail.patch -- gh#pytest-dev/pytest#8664
|
||||
Patch0: pytest-pr8664-py3.10-test_trial_error-fail.patch
|
||||
# PATCH-FIX-UPSTREAM pytest-pr9417-py3.10.1-fail.patch -- gh#pytest-dev/pytest#9417
|
||||
Patch1: https://github.com/pytest-dev/pytest/pull/9417.patch#/pytest-pr9417-py3.10.1-fail.patch
|
||||
Patch1: pytest-pr9417-py3.10.1-fail.patch
|
||||
BuildRequires: %{python_module setuptools >= 42.0}
|
||||
BuildRequires: %{python_module setuptools_scm}
|
||||
BuildRequires: %{python_module toml}
|
||||
|
Loading…
Reference in New Issue
Block a user