From 40b3284969b231233c5040119cacd47c9b60486a4854c2a6439ca736f00b2937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 25 Aug 2020 10:09:19 +0000 Subject: [PATCH] Accepting request 829131 from home:mcalabkova:branches:devel:languages:python:pytest - Update to 3.4.1 * Fix numpy error ``ValueError: Seed must be between 0 and 2**32 - 1`` when passed a seed outside of this range. - Add upstream patch pytest6.patch to fix tests OBS-URL: https://build.opensuse.org/request/show/829131 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-randomly?expand=0&rev=20 --- 3.4.0.tar.gz | 3 -- 3.4.1.tar.gz | 3 ++ pytest6.patch | 71 ++++++++++++++++++++++++++++++++++ python-pytest-randomly.changes | 8 ++++ python-pytest-randomly.spec | 9 +++-- 5 files changed, 88 insertions(+), 6 deletions(-) delete mode 100644 3.4.0.tar.gz create mode 100644 3.4.1.tar.gz create mode 100644 pytest6.patch diff --git a/3.4.0.tar.gz b/3.4.0.tar.gz deleted file mode 100644 index e34b7ef..0000000 --- a/3.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f6144bfc482874a27c9d1827f4a49b9fc16c0bf4277b8159f44ee549705e7625 -size 32265 diff --git a/3.4.1.tar.gz b/3.4.1.tar.gz new file mode 100644 index 0000000..062aa45 --- /dev/null +++ b/3.4.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6760ded053c4b7457a2d49e10cb63b3ff45624a2d7fed4a832c86efe2ac5f3aa +size 32468 diff --git a/pytest6.patch b/pytest6.patch new file mode 100644 index 0000000..f57ba3c --- /dev/null +++ b/pytest6.patch @@ -0,0 +1,71 @@ +From c89ba6bb4458704f47e08d3f2fcc7cf0ebb8f9da Mon Sep 17 00:00:00 2001 +From: Adam Johnson +Date: Mon, 27 Jul 2020 12:06:57 +0100 +Subject: [PATCH] Fix deprecation warnings in tests (#281) + +--- + tests/test_pytest_randomly.py | 20 +++++++++++++------- + tox.ini | 2 +- + 2 files changed, 14 insertions(+), 8 deletions(-) + +diff --git a/tests/test_pytest_randomly.py b/tests/test_pytest_randomly.py +index 817d6ad..07cb646 100644 +--- a/tests/test_pytest_randomly.py ++++ b/tests/test_pytest_randomly.py +@@ -121,7 +121,7 @@ def test_a(): + out.stderr.fnmatch_lines( + [ + ( +- "pytest: error: argument --randomly-seed: 'invalidvalue' " ++ "*: error: argument --randomly-seed: 'invalidvalue' " + + "is not an integer or the string 'last'" + ) + ] +@@ -439,8 +439,8 @@ def collect(self): + + + class NoOpItem(pytest.Item): +- def __init__(self, path, parent, module=None): +- super(NoOpItem, self).__init__(path, parent) ++ def __init__(self, name, parent, module=None): ++ super(NoOpItem, self).__init__(name=name, parent=parent) + if module is not None: + self.module = module + +@@ -451,13 +451,19 @@ def runtest(self): + def pytest_collect_file(path, parent): + if not str(path).endswith('.py'): + return +- return MyCollector( ++ return MyCollector.from_parent( ++ parent=parent, + fspath=str(path), + items=[ +- NoOpItem(str(path), parent, 'foo'), +- NoOpItem(str(path), parent), ++ NoOpItem.from_parent( ++ name=str(path) + "1", ++ parent=parent, module="foo" ++ ), ++ NoOpItem.from_parent( ++ name=str(path) + "2", ++ parent=parent, ++ ), + ], +- parent=parent, + ) + """ + ) +diff --git a/tox.ini b/tox.ini +index 1dcee71..91722a8 100644 +--- a/tox.ini ++++ b/tox.ini +@@ -13,7 +13,7 @@ python = + 3.9: py39 + + [testenv] +-commands = pytest -p no:randomly {posargs} ++commands = python -W error::DeprecationWarning -W error::PendingDeprecationWarning -m pytest -p no:randomly {posargs} + + [testenv:py35] + deps = -rrequirements/py35.txt diff --git a/python-pytest-randomly.changes b/python-pytest-randomly.changes index 946eda9..c7e53b5 100644 --- a/python-pytest-randomly.changes +++ b/python-pytest-randomly.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Aug 25 08:27:52 UTC 2020 - Marketa Calabkova + +- Update to 3.4.1 + * Fix numpy error ``ValueError: Seed must be between 0 and 2**32 - 1`` when + passed a seed outside of this range. +- Add upstream patch pytest6.patch to fix tests + ------------------------------------------------------------------- Tue Jun 9 07:47:42 UTC 2020 - Tomáš Chvátal diff --git a/python-pytest-randomly.spec b/python-pytest-randomly.spec index c7b307f..3d7d66d 100644 --- a/python-pytest-randomly.spec +++ b/python-pytest-randomly.spec @@ -19,12 +19,14 @@ %define skip_python2 1 %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pytest-randomly -Version: 3.4.0 +Version: 3.4.1 Release: 0 Summary: Pytest plugin to randomly order tests and control random.seed License: BSD-3-Clause URL: https://github.com/pytest-dev/pytest-randomly Source: https://github.com/pytest-dev/pytest-randomly/archive/%{version}.tar.gz +#PATCH-FIX-UPSTREAM https://github.com/pytest-dev/pytest-randomly/commit/c89ba6bb4458704f47e08d3f2fcc7cf0ebb8f9da Fix deprecation warnings in tests (#281) +Patch0: pytest6.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -65,6 +67,7 @@ Features: %prep %setup -q -n pytest-randomly-%{version} +%patch0 -p1 # Disregard Python 3.4+ restriction sed -i '/python_requires/d' setup.py @@ -77,10 +80,10 @@ sed -i '/python_requires/d' setup.py %check # test_entrypoint_injection needs installed module for pytest to use -%pytest -k 'not test_entrypoint_injection and not test_passing_nonsense_for_randomly_seed' +%pytest -k 'not test_entrypoint_injection' %files %{python_files} -%doc AUTHORS.rst README.rst +%doc README.rst %license LICENSE %{python_sitelib}/*