From 94f503d1999426c3e97b690600311a139dd6831685ed624bc0861ff8af7c9e01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Mon, 17 Aug 2020 06:23:32 +0000
Subject: [PATCH] Accepting request 827040 from home:jayvdb:py-submit

Replace nose with pytest

OBS-URL: https://build.opensuse.org/request/show/827040
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-funcparserlib?expand=0&rev=12
---
 python-funcparserlib.changes |  7 +++++++
 python-funcparserlib.spec    | 21 +++++++--------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/python-funcparserlib.changes b/python-funcparserlib.changes
index a3d0ca3..ec5747a 100644
--- a/python-funcparserlib.changes
+++ b/python-funcparserlib.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Aug 16 13:34:27 UTC 2020 - John Vandenberg <jayvdb@gmail.com>
+
+- Use modernize to fix Python 2 only syntax in runtime code
+- Re-activate test suite by switching from nose to pytest
+- Tidy spec
+
 -------------------------------------------------------------------
 Tue Dec  4 12:48:18 UTC 2018 - Matej Cepl <mcepl@suse.com>
 
diff --git a/python-funcparserlib.spec b/python-funcparserlib.spec
index 0fcda93..273bb7b 100644
--- a/python-funcparserlib.spec
+++ b/python-funcparserlib.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-funcparserlib
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,23 +17,20 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%bcond_without tests
 Name:           python-funcparserlib
 Version:        0.3.6
 Release:        0
 Summary:        Recursive descent parsing library based on functional combinators
 License:        MIT
 Group:          Development/Languages/Python
-URL:            http://code.google.com/p/funcparserlib/
+URL:            https://code.google.com/p/funcparserlib/
 Source:         https://files.pythonhosted.org/packages/source/f/funcparserlib/funcparserlib-%{version}.tar.gz
+BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-BuildRequires:  python3-2to3
+BuildRequires:  python3-modernize
 BuildArch:      noarch
-%if %{with tests}
-BuildRequires:  %{python_module nose}
-%endif
 %python_subpackages
 
 %description
@@ -57,6 +54,8 @@ as well as a tiny lexer generator for token position tracking.
 
 %prep
 %setup -q -n funcparserlib-%{version}
+python-modernize -nw funcparserlib/
+sed -i "s/ur'/r'/" funcparserlib/tests/*.py
 
 %build
 %python_build
@@ -65,14 +64,8 @@ as well as a tiny lexer generator for token position tracking.
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
-%if %{with tests}
 %check
-pushd doc
-%{python_expand export PYHONPATH=%{buildroot}%{$python_sitelib}
-nosetests-%{$python_bin_suffix} -m funcparserlib
-}
-popd
-%endif
+%pytest
 
 %files %{python_files}
 %license LICENSE