14
0

- Add remove-nose.patch:

* Use pytest rather than nose in one test case.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cx_Freeze?expand=0&rev=11
This commit is contained in:
2021-09-17 02:54:36 +00:00
committed by Git OBS Bridge
parent 0f23fdae5a
commit 3eb9ab71f2
3 changed files with 36 additions and 4 deletions

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Sep 17 02:53:48 UTC 2021 - Steve Kowalik <steven.kowalik@suse.com>
- Add remove-nose.patch:
* Use pytest rather than nose in one test case.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 27 09:36:53 UTC 2020 - Petr Gajdos <pgajdos@suse.com> Wed May 27 09:36:53 UTC 2020 - Petr Gajdos <pgajdos@suse.com>

View File

@@ -1,7 +1,7 @@
# #
# spec file for package python-cx_Freeze # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -27,10 +27,9 @@ License: Python-2.0
Group: Development/Languages/Python Group: Development/Languages/Python
URL: https://github.com/anthony-tuininga/cx_Freeze URL: https://github.com/anthony-tuininga/cx_Freeze
Source: https://github.com/anthony-tuininga/cx_Freeze/archive/%{version}.tar.gz 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 base >= 3.5}
BuildRequires: %{python_module devel} BuildRequires: %{python_module devel}
# imports nose in one test
BuildRequires: %{python_module nose}
BuildRequires: %{python_module openpyxl} BuildRequires: %{python_module openpyxl}
BuildRequires: %{python_module pytest} BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools} BuildRequires: %{python_module setuptools}
@@ -38,7 +37,7 @@ BuildRequires: chrpath
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
Requires(post): update-alternatives Requires(post): update-alternatives
Requires(postun): update-alternatives Requires(postun):update-alternatives
# we provide same binary like the deprecated py2 variant # we provide same binary like the deprecated py2 variant
Conflicts: %{oldpython}-cx_Freeze Conflicts: %{oldpython}-cx_Freeze
%python_subpackages %python_subpackages
@@ -56,6 +55,7 @@ other systems.
%prep %prep
%setup -q -n cx_Freeze-%{version} %setup -q -n cx_Freeze-%{version}
%autopatch -p1
sed -i -e '/^#!\//, 1d' cx_Freeze/samples/*/*.py sed -i -e '/^#!\//, 1d' cx_Freeze/samples/*/*.py
chmod a-x cx_Freeze/initscripts/*.py chmod a-x cx_Freeze/initscripts/*.py

26
remove-nose.patch Normal file
View File

@@ -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')])