From 8f774c3b9f40d04f66a46759d57c82ef5d71a8e1989bc375a9493ec49c78810e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Tue, 5 Nov 2024 12:32:54 +0100 Subject: [PATCH] Update to 1.16.0: - Add support for Python 3.13 - Drop support for Python 3.9 - New Repository.hashfile(...) - New Option.GET_MWINDOW_FILE_LIMIT and Option.SET_MWINDOW_FILE_LIMIT - Fix overriding certificate_check(...) callback via argument to RemoteCallbacks(...) - Add py.typed - Fix discover_repository(...) annotation Add const-parents.patch to fix FTBFS (gh#libgit2/pygit2!1324). --- .gitignore | 1 + const-parents.patch | 27 +++++++++++++++++++++++++++ pygit2-1.15.1.tar.gz | 3 --- pygit2-1.16.0.tar.gz | 3 +++ python-pygit2.changes | 15 +++++++++++++++ python-pygit2.spec | 16 +++++++--------- 6 files changed, 53 insertions(+), 12 deletions(-) create mode 100644 const-parents.patch delete mode 100644 pygit2-1.15.1.tar.gz create mode 100644 pygit2-1.16.0.tar.gz diff --git a/.gitignore b/.gitignore index 76bc7d3..59a730b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .osc _scmsync.obsinfo +pygit2-*/ diff --git a/const-parents.patch b/const-parents.patch new file mode 100644 index 0000000..2669549 --- /dev/null +++ b/const-parents.patch @@ -0,0 +1,27 @@ + +--- + src/repository.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/src/repository.c ++++ b/src/repository.c +@@ -1065,7 +1065,8 @@ Repository_create_commit(Repository *sel + + err = git_commit_create(&oid, self->repo, update_ref, + py_author->signature, py_committer->signature, +- encoding, message, tree, parent_count, parents); ++ encoding, message, tree, parent_count, ++ (const git_commit **)parents); + if (err < 0) { + Error_set(err); + goto out; +@@ -1147,7 +1148,8 @@ Repository_create_commit_string(Reposito + + err = git_commit_create_buffer(&buf, self->repo, + py_author->signature, py_committer->signature, +- encoding, message, tree, parent_count, parents); ++ encoding, message, tree, parent_count, ++ (const git_commit **)parents); + if (err < 0) { + Error_set(err); + goto out; diff --git a/pygit2-1.15.1.tar.gz b/pygit2-1.15.1.tar.gz deleted file mode 100644 index 94277a1..0000000 --- a/pygit2-1.15.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1fe8b85053d9713043c81eccc74132f9e5b603f209e80733d7955eafd22eb9d -size 768818 diff --git a/pygit2-1.16.0.tar.gz b/pygit2-1.16.0.tar.gz new file mode 100644 index 0000000..586d40d --- /dev/null +++ b/pygit2-1.16.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b29a6796baa15fc89d443ac8d51775411d9b1e5b06dc40d458c56c8576b48a2 +size 768597 diff --git a/python-pygit2.changes b/python-pygit2.changes index 6486fca..9680a02 100644 --- a/python-pygit2.changes +++ b/python-pygit2.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Nov 5 10:50:38 UTC 2024 - Matej Cepl + +- Update to 1.16.0: + - Add support for Python 3.13 + - Drop support for Python 3.9 + - New Repository.hashfile(...) + - New Option.GET_MWINDOW_FILE_LIMIT and + Option.SET_MWINDOW_FILE_LIMIT + - Fix overriding certificate_check(...) callback via argument + to RemoteCallbacks(...) + - Add py.typed + - Fix discover_repository(...) annotation +- Add const-parents.patch to fix FTBFS (gh#libgit2/pygit2!1324). + ------------------------------------------------------------------- Mon Aug 5 11:21:06 UTC 2024 - John Paul Adrian Glaubitz diff --git a/python-pygit2.spec b/python-pygit2.spec index c424806..7f7f63e 100644 --- a/python-pygit2.spec +++ b/python-pygit2.spec @@ -19,14 +19,18 @@ %{?sle15_python_module_pythons} Name: python-pygit2 -Version: 1.15.1 +Version: 1.16.0 Release: 0 Summary: Python bindings for libgit2 License: GPL-2.0-only URL: https://github.com/libgit2/pygit2 Source: https://files.pythonhosted.org/packages/source/p/pygit2/pygit2-%{version}.tar.gz +# PATCH-FIX-UPSTREAM const-parents.patch gh#libgit2/pygit2!1324 mcepl@suse.com +# use correct type of git_commit_create() function +Patch0: const-parents.patch +BuildRequires: %{python_module base >= 3.10} BuildRequires: %{python_module cached-property} -BuildRequires: %{python_module cffi >= 1.16.0} +BuildRequires: %{python_module cffi >= 1.17.0} BuildRequires: %{python_module devel} BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} @@ -39,7 +43,7 @@ BuildRequires: libgit2-devel >= 1.1 BuildRequires: libopenssl-devel BuildRequires: python-rpm-macros Requires: python-cached-property -%requires_eq python-cffi +Requires: python-cffi >= 1.17.0 %python_subpackages %description @@ -47,12 +51,6 @@ Bindings for libgit2, a linkable C library for the Git version-control system. %prep %autosetup -p1 -n pygit2-%{version} -%if %{?pkg_vcmp:%pkg_vcmp libgit2-devel < 1.8}%{!?pkg_vcmp:1} -%patch -P 3 -p1 -R -%patch -P 2 -p1 -R -%patch -P 1 -p1 -R -%patch -P 0 -p1 -R -%endif # do not add options to pytest rm pytest.ini