diff --git a/dulwich-0.21.7.tar.gz b/dulwich-0.21.7.tar.gz deleted file mode 100644 index ecfb3c8..0000000 --- a/dulwich-0.21.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9e9c66833cea580c3ac12927e4b9711985d76afca98da971405d414de60e968 -size 448028 diff --git a/dulwich-0.22.1.tar.gz b/dulwich-0.22.1.tar.gz new file mode 100644 index 0000000..19126de --- /dev/null +++ b/dulwich-0.22.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de781e7355d922c790ca7c5d6c8c2ad94c79e815401dee717785eb807a5174c6 +size 443403 diff --git a/geventhttpclient-compat.patch b/geventhttpclient-compat.patch new file mode 100644 index 0000000..d12c9f0 --- /dev/null +++ b/geventhttpclient-compat.patch @@ -0,0 +1,35 @@ +From 7064f5f0b8094877459f4b6ed2eff72627a19750 Mon Sep 17 00:00:00 2001 +From: PerchunPak +Date: Sun, 28 Apr 2024 17:42:10 +0200 +Subject: [PATCH] Keep up with changes in geventhttpclient + +--- + dulwich/contrib/swift.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: dulwich-dulwich-0.22.1/dulwich/contrib/swift.py +=================================================================== +--- dulwich-dulwich-0.22.1.orig/dulwich/contrib/swift.py ++++ dulwich-dulwich-0.22.1/dulwich/contrib/swift.py +@@ -257,7 +257,7 @@ class SwiftConnector: + if ret.status_code < 200 or ret.status_code >= 300: + raise SwiftException( + "AUTH v1.0 request failed on " +- + f"{str(auth_httpclient.get_base_url()) + path} with error code {ret.status_code} ({ret.items()!s})" ++ + f"{self.auth_url} with error code {ret.status_code} ({ret.items()!s})" + ) + storage_url = ret["X-Storage-Url"] + token = ret["X-Auth-Token"] +Index: dulwich-dulwich-0.22.1/tests/test_greenthreads.py +=================================================================== +--- dulwich-dulwich-0.22.1.orig/tests/test_greenthreads.py ++++ dulwich-dulwich-0.22.1/tests/test_greenthreads.py +@@ -35,7 +35,7 @@ except ImportError: + gevent_support = False + + if gevent_support: +- from ..greenthreads import GreenThreadsMissingObjectFinder ++ from dulwich.greenthreads import GreenThreadsMissingObjectFinder + + skipmsg = "Gevent library is not installed" + diff --git a/python-dulwich.changes b/python-dulwich.changes index 49a606a..169f92a 100644 --- a/python-dulwich.changes +++ b/python-dulwich.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Tue Oct 8 09:51:33 UTC 2024 - Daniel Garcia + +- Add patch geventhttpclient-compat.patch to make it compatible with + latest geventhttpclient. + (gh#jelmer/dulwich#1299, gh#jelmer/dulwich#1294) +- Update 0.22.1: + * Fix pypi deployments by @jelmer in #1284 + * Handle alternate case for worktreeconfig setting by @wshanks in #1286 + * Ship rust files. Fixes #1287 by @jelmer in #1290 +- update 0.22.0: + * Start on 0.21.8 by @jelmer in #1240 + * Install twine when uploading to pypi by @jelmer in #1241 + * Remove shebang from graph.py by @mtelka in #1242 + * Disable pypi uploads in disperse; this is now down by the GitHub actions workflow by @jelmer in #1243 + * tweak doc-strings in LocalGitClient for clarity by @stspdotname in #1245 + * Keep GitHub Actions up to date with GitHub's Dependabot by @cclauss in #1249 + * Bump the github_actions group with 5 updates by @dependabot in #1250 + * Add Python 3.12 to the testing by @cclauss in #1251 + * pyproject.toml: Add trove classifier for Python 3.12 by @cclauss in #1252 + * Convert _objects.c to _objects.rs by @jelmer in #1204 + * Convert pack C helper to rust by @jelmer in #1255 + * Convert diff-tree C helper to rust by @jelmer in #1256 + * Revert "Bump the github_actions group with 5 updates" by @jelmer in #1257 + * Only expect a shallow update when requesting a depth by @abderrahim in #1259 + * Use f-strings by @jelmer in #1263 + * Wrap all urllib3 read ProtocolErrors as GitProtocolError by @nanonyme in #1261 + * Update cargo dependencies with dependabot by @jelmer in #1264 + * wheels: Don't build with nightly by @jelmer in #1273 + * Reformat with ruff by @jelmer in #1272 + * Use latest cibuildwheel by @jelmer in #1276 + * cibuildwheel: define options in pyproject.toml by @jelmer in #1275 + * Move tests to root. Fixes #1024 by @jelmer in #1277 + * Stop installing docs/ as part of package code by @jelmer in #1278 + * Bump pyo3 from 0.21.1 to 0.21.2 by @dependabot in #1280 + * Set correct version for rust modules by @jelmer in #1281 + * Fix installation of tests package by @jelmer in #1282 + ------------------------------------------------------------------- Wed Dec 6 09:36:03 UTC 2023 - Dirk Müller diff --git a/python-dulwich.spec b/python-dulwich.spec index bef5956..cca0ac5 100644 --- a/python-dulwich.spec +++ b/python-dulwich.spec @@ -1,7 +1,7 @@ # # spec file for package python-dulwich # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,15 +25,20 @@ %{?sle15_python_module_pythons} %define oldpython python Name: python-dulwich -Version: 0.21.7 +Version: 0.22.1 Release: 0 Summary: Pure-Python Git Library License: Apache-2.0 OR GPL-2.0-or-later Group: Development/Languages/Python URL: https://www.dulwich.io -Source0: https://files.pythonhosted.org/packages/source/d/dulwich/dulwich-%{version}.tar.gz +Source0: https://github.com/jelmer/dulwich/archive/dulwich-%{version}.tar.gz#/dulwich-%{version}.tar.gz +# PATCH-FIX-UPSTREAM geventhttpclient-compat.patch gh#jelmer/dulwich#1299, gh#jelmer/dulwich#1294 +Patch0: geventhttpclient-compat.patch BuildRequires: %{python_module devel} +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools >= 17.1} +BuildRequires: %{python_module setuptools-rust} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros %if %{with test} @@ -42,6 +47,7 @@ BuildRequires: %{python_module fastimport} BuildRequires: %{python_module geventhttpclient} BuildRequires: %{python_module gevent} BuildRequires: %{python_module gpg} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module typing_extensions if %python-base < 3.8} BuildRequires: %{python_module urllib3 >= 1.24.1} %if 0%{?suse_version} <= 1500 @@ -53,7 +59,7 @@ Requires: python-urllib3 >= 1.24.1 Requires: python-typing_extensions %endif Requires(post): update-alternatives -Requires(preun):update-alternatives +Requires(preun): update-alternatives Recommends: python-fastimport Recommends: python-gpg Obsoletes: %{oldpython}-dulwich-doc < 0.20.5 @@ -64,16 +70,16 @@ Simple Pure-Python implementation of the Git file formats and protocols. Dulwich is the place where Mr. and Mrs. Git live in one of the Monty Python sketches. %prep -%autosetup -p1 -n dulwich-%{version} +%autosetup -p1 -n dulwich-dulwich-%{version} +sed -i '/usr\/bin\/env/d' dulwich/contrib/diffstat.py %build export CFLAGS="%{optflags}" -%python_build +%pyproject_wheel %install -%python_install -# Do not remove tests as they are reused by other packages -#%%python_expand rm -r %{buildroot}%{$python_sitearch}/dulwich/tests +%pyproject_install + %python_expand %fdupes %{buildroot}%{$python_sitearch} %python_clone -a %{buildroot}%{_bindir}/dulwich %python_clone -a %{buildroot}%{_bindir}/dul-receive-pack @@ -81,7 +87,7 @@ export CFLAGS="%{optflags}" %check %if %{with test} -%python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} $python -m unittest dulwich.tests.test_suite +%python_expand $python -m unittest tests.test_suite %endif %post @@ -100,6 +106,7 @@ export CFLAGS="%{optflags}" %python_alternative dulwich %python_alternative dul-receive-pack %python_alternative dul-upload-pack -%{python_sitearch}/* +%{python_sitearch}/dulwich +%{python_sitearch}/dulwich-%{version}*-info %changelog