From 77aab6c1d3f073b0cbb19259b3f5775491c317579422a0a2257de6342cb8d34a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 3 Jun 2020 08:59:48 +0000 Subject: [PATCH] Accepting request 811047 from home:pgajdos:python - unittest2 -> pytest OBS-URL: https://build.opensuse.org/request/show/811047 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyparsing?expand=0&rev=74 --- python-pyparsing.changes | 5 +++++ python-pyparsing.spec | 10 +++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/python-pyparsing.changes b/python-pyparsing.changes index ac0bd3e..a34c21a 100644 --- a/python-pyparsing.changes +++ b/python-pyparsing.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 3 08:31:39 UTC 2020 - pgajdos@suse.com + +- unittest2 -> pytest + ------------------------------------------------------------------- Tue May 5 09:08:59 UTC 2020 - Dirk Mueller diff --git a/python-pyparsing.spec b/python-pyparsing.spec index 89b7ced..0ddd5c1 100644 --- a/python-pyparsing.spec +++ b/python-pyparsing.spec @@ -27,6 +27,7 @@ %define psuffix %{nil} %bcond_with test %endif +%bcond_without python2 Name: python-pyparsing%{psuffix} Version: 2.4.7 Release: 0 @@ -39,7 +40,7 @@ BuildRequires: fdupes BuildRequires: python-rpm-macros BuildArch: noarch %if %{with test} -BuildRequires: %{python_module unittest2} +BuildRequires: %{python_module pytest} %endif %ifpython2 Provides: %{oldpython}-parsing = %{version} @@ -74,12 +75,7 @@ cp -r pyparsing.egg-info %{buildroot}%{$python_sitelib}/pyparsing-%{version}-py% %check %if %{with test} -%{python_expand export PYTHONPATH=. -# unittest from Python 2.7 doesn't load tests correctly -# no work simple_unit_tests.py examples.antlr_grammar_tests -$python -munittest2 -v examples.test_bibparse -$python unitTests.py -} +%pytest %endif %if ! %{with test}