diff --git a/python-easydev-no-mock.patch b/python-easydev-no-mock.patch new file mode 100644 index 0000000..ec77d79 --- /dev/null +++ b/python-easydev-no-mock.patch @@ -0,0 +1,34 @@ +Index: easydev-0.12.0/test/test_appdirs.py +=================================================================== +--- easydev-0.12.0.orig/test/test_appdirs.py 2020-06-03 19:27:51.000000000 +0200 ++++ easydev-0.12.0/test/test_appdirs.py 2022-03-16 14:45:51.220342072 +0100 +@@ -1,4 +1,7 @@ +-import mock ++try: ++ from unittest.mock import patch ++except: ++ from mock import patch + + def test_app(): + +@@ -10,17 +13,17 @@ def test_app(): + app.user_cache_dir + app.user_log_dir + +- with mock.patch("sys.platform", "darwin"): ++ with patch("sys.platform", "darwin"): + from easydev import appdirs + app = appdirs.AppDirs("test") + getter(app) + +- with mock.patch("sys.platform", "win32"): ++ with patch("sys.platform", "win32"): + from easydev import appdirs + app = appdirs.AppDirs("test") + getter(app) + +- with mock.patch("sys.platform", "linux"): ++ with patch("sys.platform", "linux"): + from easydev import appdirs + app = appdirs.AppDirs("test") + getter(app) diff --git a/python-easydev.changes b/python-easydev.changes index 426996b..37fcf1b 100644 --- a/python-easydev.changes +++ b/python-easydev.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Mar 16 13:50:05 UTC 2022 - pgajdos@suse.com + +- do not require python-mock for build +- added patches + fix https://github.com/cokelaer/easydev/issues/20 + + python-easydev-no-mock.patch + ------------------------------------------------------------------- Thu Sep 16 04:01:51 UTC 2021 - Steve Kowalik diff --git a/python-easydev.spec b/python-easydev.spec index 2e86c2b..115a7e8 100644 --- a/python-easydev.spec +++ b/python-easydev.spec @@ -1,7 +1,7 @@ # # spec file for package python-easydev # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,8 @@ Summary: Common utilities to ease the development of Python packages License: BSD-3-Clause URL: https://github.com/cokelaer/easydev Source: https://files.pythonhosted.org/packages/source/e/easydev/easydev-%{version}.tar.gz +# https://github.com/cokelaer/easydev/issues/20 +Patch0: python-easydev-no-mock.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -39,7 +41,6 @@ BuildArch: noarch BuildRequires: %{python_module colorama} BuildRequires: %{python_module colorlog} BuildRequires: %{python_module line_profiler} -BuildRequires: %{python_module mock} BuildRequires: %{python_module pexpect} BuildRequires: %{python_module pytest-cov} BuildRequires: %{python_module pytest-mock} @@ -54,7 +55,7 @@ is to help developers on speeding up their own dev. It has been used also as an incubator for other packages and is stable. %prep -%setup -q -n easydev-%{version} +%autosetup -p1 -n easydev-%{version} sed -i -e '/^#!\//, 1d' easydev/appdirs.py %build