Hello community, here is the log from the commit of package python-dulwich for openSUSE:Factory checked in at 2020-12-16 10:59:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-dulwich (Old) and /work/SRC/openSUSE:Factory/.python-dulwich.new.2328 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-dulwich" Wed Dec 16 10:59:32 2020 rev:35 rq:855662 version:0.20.11 Changes: -------- --- /work/SRC/openSUSE:Factory/python-dulwich/python-dulwich.changes 2020-11-13 18:54:10.341782405 +0100 +++ /work/SRC/openSUSE:Factory/.python-dulwich.new.2328/python-dulwich.changes 2020-12-16 10:59:34.827516433 +0100 @@ -1,0 +2,16 @@ +Mon Dec 14 00:50:05 UTC 2020 - Benjamin Greiner <c...@bnavigator.de> + +- Fix condition around BuildRequirement + +------------------------------------------------------------------- +Sun Dec 13 20:31:22 UTC 2020 - Matej Cepl <mc...@suse.com> + +- We don't need to break Python 2.7 + +------------------------------------------------------------------- +Fri Dec 11 21:52:35 UTC 2020 - Matej Cepl <mc...@suse.com> + +- Add remove_mock.patch to remove dependency on the external mock + package (gh#dulwich/dulwich#820). + +------------------------------------------------------------------- New: ---- remove_mock.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-dulwich.spec ++++++ --- /var/tmp/diff_new_pack.dJnMzL/_old 2020-12-16 10:59:35.735517325 +0100 +++ /var/tmp/diff_new_pack.dJnMzL/_new 2020-12-16 10:59:35.739517329 +0100 @@ -27,15 +27,20 @@ Group: Development/Languages/Python URL: https://www.dulwich.io Source0: https://files.pythonhosted.org/packages/source/d/dulwich/dulwich-%{version}.tar.gz +# PATCH-FIX-UPSTREAM remove_mock.patch gh#dulwich/dulwich#820 mc...@suse.com +# remove dependency on the external module mock +Patch0: remove_mock.patch BuildRequires: %{python_module certifi} BuildRequires: %{python_module devel} BuildRequires: %{python_module fastimport} BuildRequires: %{python_module geventhttpclient} BuildRequires: %{python_module gevent} BuildRequires: %{python_module gpg} -BuildRequires: %{python_module mock} BuildRequires: %{python_module setuptools >= 17.1} BuildRequires: %{python_module urllib3 >= 1.24.1} +%if 0%{?suse_version} <= 1500 +BuildRequires: python-mock +%endif BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-Sphinx @@ -55,7 +60,7 @@ is the place where Mr. and Mrs. Git live in one of the Monty Python sketches. %prep -%setup -q -n dulwich-%{version} +%autosetup -p1 -n dulwich-%{version} %build export CFLAGS="%{optflags}" ++++++ remove_mock.patch ++++++ --- a/dulwich/contrib/test_swift.py +++ b/dulwich/contrib/test_swift.py @@ -58,9 +58,12 @@ except ImportError: missing_libs.append("geventhttpclient") try: - from mock import patch + from unittest.mock import patch except ImportError: - missing_libs.append("mock") + try: + from mock import patch + except ImportError: + missing_libs.append("mock") skipmsg = "Required libraries are not installed (%r)" % missing_libs --- a/dulwich/tests/test_archive.py +++ b/dulwich/tests/test_archive.py @@ -41,9 +41,12 @@ from dulwich.tests.utils import ( ) try: - from mock import patch + from unittest.mock import patch except ImportError: - patch = None # type: ignore + try: + from mock import patch + except ImportError: + patch = None # type: ignore class ArchiveTests(TestCase): --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ tests_require = ['fastimport'] if '__pypy__' not in sys.modules and not sys.platform == 'win32': tests_require.extend([ - 'gevent', 'geventhttpclient', 'mock', 'setuptools>=17.1']) + 'gevent', 'geventhttpclient', 'setuptools>=17.1']) ext_modules = [ _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
