Accepting request 859225 from devel:languages:python

- update to 0.20.15:
 * Add some functions for parsing and writing bundles.
 * Add ``no_verify`` flag to ``porcelain.commit`` and ``Repo.do_commit``.
 * Remove dependency on external mock module.
- drop remove_mock.patch (upstream)

OBS-URL: https://build.opensuse.org/request/show/859225
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-dulwich?expand=0&rev=37

dulwich-0.20.14.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:21d6ee82708f7c67ce3fdcaf1f1407e524f7f4f7411a410a972faa2176baec0d
-size 389825

dulwich-0.20.15.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb1773373ec2af896031f8312af6962a1b8b0176a2de3fb3d84a84ec04498888
+size 391841

python-dulwich.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Dec 29 13:32:51 UTC 2020 - Dirk Müller <dmueller@suse.com>
+
+- update to 0.20.15:
+ * Add some functions for parsing and writing bundles.
+ * Add ``no_verify`` flag to ``porcelain.commit`` and ``Repo.do_commit``.
+ * Remove dependency on external mock module.
+- drop remove_mock.patch (upstream)
+
 -------------------------------------------------------------------
 Sun Dec 20 09:26:43 UTC 2020 - Dirk Müller <dmueller@suse.com>
 

python-dulwich.spec

@@ -20,16 +20,13 @@
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define skip_python2 1
 Name:           python-dulwich
-Version:        0.20.14
+Version:        0.20.15
 Release:        0
 Summary:        Pure-Python Git Library
 License:        GPL-2.0-or-later OR Apache-2.0
 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 mcepl@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}

remove_mock.patch

@@ -1,45 +0,0 @@
---- 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 = [