From e1b84222ca88bc38fe2d75e47690e2ec314df22eb1196e1eab172302016115af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 1 Jun 2020 11:42:34 +0000 Subject: [PATCH] Accepting request 810593 from home:pgajdos:python - unittest2 is not neccessary for python3 - added patches use unittest2 only if present, fall back to unittest + python-bibtexparser-remove-unittest2.patch OBS-URL: https://build.opensuse.org/request/show/810593 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-bibtexparser?expand=0&rev=6 --- python-bibtexparser-remove-unittest2.patch | 13 +++++++++++++ python-bibtexparser.changes | 8 ++++++++ python-bibtexparser.spec | 8 +++++++- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 python-bibtexparser-remove-unittest2.patch diff --git a/python-bibtexparser-remove-unittest2.patch b/python-bibtexparser-remove-unittest2.patch new file mode 100644 index 0000000..a5a53e3 --- /dev/null +++ b/python-bibtexparser-remove-unittest2.patch @@ -0,0 +1,13 @@ +Index: python-bibtexparser-1.1.0/bibtexparser/tests/test_crossref_resolving.py +=================================================================== +--- python-bibtexparser-1.1.0.orig/bibtexparser/tests/test_crossref_resolving.py 2019-01-17 16:31:34.000000000 +0100 ++++ python-bibtexparser-1.1.0/bibtexparser/tests/test_crossref_resolving.py 2020-06-01 11:32:48.246219654 +0200 +@@ -1,4 +1,7 @@ +-import unittest2 as unittest ++try: ++ import unittest2 as unittest ++except ImportError: ++ import unittest + from bibtexparser.bibdatabase import BibDatabase + from bibtexparser.bparser import BibTexParser + diff --git a/python-bibtexparser.changes b/python-bibtexparser.changes index 87494cf..9cbeaa1 100644 --- a/python-bibtexparser.changes +++ b/python-bibtexparser.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jun 1 10:15:19 UTC 2020 - pgajdos@suse.com + +- unittest2 is not neccessary for python3 +- added patches + use unittest2 only if present, fall back to unittest + + python-bibtexparser-remove-unittest2.patch + ------------------------------------------------------------------- Wed Apr 15 10:00:08 UTC 2020 - Matej Cepl diff --git a/python-bibtexparser.spec b/python-bibtexparser.spec index 2aa1ee9..5190e95 100644 --- a/python-bibtexparser.spec +++ b/python-bibtexparser.spec @@ -17,6 +17,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%bcond_without python2 Name: python-bibtexparser Version: 1.1.0 Release: 0 @@ -25,6 +26,8 @@ License: LGPL-3.0-only OR BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/sciunto-org/python-bibtexparser Source: https://github.com/sciunto-org/python-bibtexparser/archive/v%{version}.tar.gz#/python-bibtexparser-%{version}.tar.gz +# https://github.com/sciunto-org/python-bibtexparser/pull/259 +Patch0: python-bibtexparser-remove-unittest2.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -36,7 +39,9 @@ BuildArch: noarch BuildRequires: %{python_module future >= 0.16.0} BuildRequires: %{python_module pyparsing >= 2.0.3} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module unittest2} +%if %{with python2} +BuildRequires: python-unittest2 +%endif # /SECTION %python_subpackages @@ -45,6 +50,7 @@ Python library to parse bibtex files.. %prep %setup -q -n python-bibtexparser-%{version} +%patch0 -p1 sed -i -e '/^#!\//, 1d' bibtexparser/*.py %build