diff --git a/python-cx_Freeze.changes b/python-cx_Freeze.changes index 5de4ecd..a7233ff 100644 --- a/python-cx_Freeze.changes +++ b/python-cx_Freeze.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 17 02:53:48 UTC 2021 - Steve Kowalik + +- Add remove-nose.patch: + * Use pytest rather than nose in one test case. + ------------------------------------------------------------------- Wed May 27 09:36:53 UTC 2020 - Petr Gajdos diff --git a/python-cx_Freeze.spec b/python-cx_Freeze.spec index 629fb32..05d2130 100644 --- a/python-cx_Freeze.spec +++ b/python-cx_Freeze.spec @@ -1,7 +1,7 @@ # # spec file for package python-cx_Freeze # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,10 +27,9 @@ License: Python-2.0 Group: Development/Languages/Python URL: https://github.com/anthony-tuininga/cx_Freeze Source: https://github.com/anthony-tuininga/cx_Freeze/archive/%{version}.tar.gz +Patch0: remove-nose.patch BuildRequires: %{python_module base >= 3.5} BuildRequires: %{python_module devel} -# imports nose in one test -BuildRequires: %{python_module nose} BuildRequires: %{python_module openpyxl} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} @@ -38,7 +37,7 @@ BuildRequires: chrpath BuildRequires: fdupes BuildRequires: python-rpm-macros Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives # we provide same binary like the deprecated py2 variant Conflicts: %{oldpython}-cx_Freeze %python_subpackages @@ -56,6 +55,7 @@ other systems. %prep %setup -q -n cx_Freeze-%{version} +%autopatch -p1 sed -i -e '/^#!\//, 1d' cx_Freeze/samples/*/*.py chmod a-x cx_Freeze/initscripts/*.py diff --git a/remove-nose.patch b/remove-nose.patch new file mode 100644 index 0000000..661a996 --- /dev/null +++ b/remove-nose.patch @@ -0,0 +1,26 @@ +Index: cx_Freeze-6.0/test/test_misc.py +=================================================================== +--- cx_Freeze-6.0.orig/test/test_misc.py ++++ cx_Freeze-6.0/test/test_misc.py +@@ -1,7 +1,7 @@ + from os.path import join as pjoin + import sys + +-from nose.tools import assert_raises ++from pytest import raises + + from cx_Freeze.freezer import process_path_specs, ConfigError + +@@ -15,8 +15,8 @@ def test_process_path_specs(): + (pjoin(rootdir, 'foo', 'qux'), pjoin('baz', 'xyz'))] + + def test_process_path_specs_bad(): +- with assert_raises(ConfigError): ++ with raises(ConfigError): + process_path_specs([(pjoin(rootdir, 'foo'), pjoin(rootdir, 'bar'))]) + +- with assert_raises(ConfigError): +- process_path_specs([('a', 'b', 'c')]) +\ No newline at end of file ++ with raises(ConfigError): ++ process_path_specs([('a', 'b', 'c')])