From 7322c5d71c3e5af60b458fa940e7cf70694967b7697bac5e19c094bff428f29a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 29 Jun 2020 11:44:53 +0000 Subject: [PATCH] - Do not disable py2 build for Leap - Use pytest directly, pytest-runner is deprecated upstream OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Cerberus?expand=0&rev=19 --- python-Cerberus.changes | 6 ++++++ python-Cerberus.spec | 7 ++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/python-Cerberus.changes b/python-Cerberus.changes index a532745..9a0b81e 100644 --- a/python-Cerberus.changes +++ b/python-Cerberus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 29 11:43:45 UTC 2020 - Tomáš Chvátal + +- Do not disable py2 build for Leap +- Use pytest directly, pytest-runner is deprecated upstream + ------------------------------------------------------------------- Sat Jun 20 08:15:08 UTC 2020 - John Paul Adrian Glaubitz diff --git a/python-Cerberus.spec b/python-Cerberus.spec index 1b120a3..ea44118 100644 --- a/python-Cerberus.spec +++ b/python-Cerberus.spec @@ -17,7 +17,6 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define skip_python2 1 Name: python-Cerberus Version: 1.3.2 Release: 0 @@ -29,7 +28,7 @@ Source: https://files.pythonhosted.org/packages/source/C/Cerberus/Cerber BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros # SECTION tests -BuildRequires: %{python_module pytest-runner} +BuildRequires: %{python_module pytest} # /SECTION BuildRequires: fdupes BuildArch: noarch @@ -52,9 +51,7 @@ validation. %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%{python_expand rm -rf _build*/ build/ -$python setup.py test -} +%pytest %files %{python_files} %doc README.rst UPGRADING.rst AUTHORS