From bf9ebaf7b3ec196ac8e6e76122fcf54f368a2039d9f50c04952f7ec89c338d57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 14 May 2019 17:13:21 +0000 Subject: [PATCH] Accepting request 702903 from home:scarabeus_iv:branches:devel:languages:python - Add patch to fix build with new mock versions: * fix-mock-dep.patch OBS-URL: https://build.opensuse.org/request/show/702903 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-nose2?expand=0&rev=10 --- fix-mock-dep.patch | 13 +++++++++++++ python-nose2.changes | 6 ++++++ python-nose2.spec | 3 ++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 fix-mock-dep.patch diff --git a/fix-mock-dep.patch b/fix-mock-dep.patch new file mode 100644 index 0000000..aa2eb0e --- /dev/null +++ b/fix-mock-dep.patch @@ -0,0 +1,13 @@ +Index: nose2-0.9.1/setup.py +=================================================================== +--- nose2-0.9.1.orig/setup.py ++++ nose2-0.9.1/setup.py +@@ -32,7 +32,7 @@ setup( + # mock on py2, py3.4 and py3.5 + # not just py2: py3 versions of mock don't all have the same + # interface and this can cause issues +- 'mock==2.0.0;python_version<"3.6"', ++ 'mock>=2.0.0;python_version<"3.6"', + ], + extras_require={ + "coverage_plugin": ["coverage>=4.4.1"], diff --git a/python-nose2.changes b/python-nose2.changes index 4067e0a..20ed1c6 100644 --- a/python-nose2.changes +++ b/python-nose2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 14 17:02:07 UTC 2019 - Tomáš Chvátal + +- Add patch to fix build with new mock versions: + * fix-mock-dep.patch + ------------------------------------------------------------------- Mon Apr 8 11:19:14 UTC 2019 - Ondřej Súkup diff --git a/python-nose2.spec b/python-nose2.spec index 23ff525..118e731 100644 --- a/python-nose2.spec +++ b/python-nose2.spec @@ -26,6 +26,7 @@ Group: Development/Languages/Python URL: https://github.com/nose-devs/nose2 Source: https://files.pythonhosted.org/packages/source/n/nose2/nose2-%{version}.tar.gz Patch0: remove_unittest2.patch +Patch1: fix-mock-dep.patch BuildRequires: %{python_module cov-core >= 1.12} BuildRequires: %{python_module mock} BuildRequires: %{python_module setuptools} @@ -62,7 +63,7 @@ is to be done through config files, not command-line options. %python_clone -a %{buildroot}%{_bindir}/nose2 %check -export LC_CTYPE=C.UTF8 +export LC_CTYPE=C.UTF8 %python_exec setup.py test %post