From b00627d4f24681cc09526df0a992bf3b9727a36367cc582587dab794e44ebdcc Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 24 Sep 2024 10:18:34 +0000 Subject: [PATCH 1/6] [info=5ddd6ee66d4d50758a67277b320de87769a4722ab143b2f24cbb0e0d52f5aada] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pygit2?expand=0&rev=97 --- _scmsync.obsinfo | 4 ++++ build.specials.obscpio | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 _scmsync.obsinfo create mode 100644 build.specials.obscpio diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo new file mode 100644 index 0000000..d495dd6 --- /dev/null +++ b/_scmsync.obsinfo @@ -0,0 +1,4 @@ +mtime: 1722871444 +commit: 5ddd6ee66d4d50758a67277b320de87769a4722ab143b2f24cbb0e0d52f5aada +url: https://src.opensuse.org/pool/python-pygit2 +revision: factory diff --git a/build.specials.obscpio b/build.specials.obscpio new file mode 100644 index 0000000..8a42595 --- /dev/null +++ b/build.specials.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a62b5149fe863f60bc19559e42c1372f634584c2b3e82a7103be03921ba94d87 +size 256 From b9267b7763279c48a668d3f66138719959904b993be7f3b8218911a01eea7e05 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 5 Nov 2024 14:42:22 +0000 Subject: [PATCH 2/6] [info=c0760b117fc40c177bf755bf33d8afcf98ad5dfa5af50e0556b3773a03b56f59] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pygit2?expand=0&rev=98 --- _scmsync.obsinfo | 4 ++-- build.specials.obscpio | 4 ++-- 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 +++++++--------- 7 files changed, 56 insertions(+), 16 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/_scmsync.obsinfo b/_scmsync.obsinfo index d495dd6..8675986 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1722871444 -commit: 5ddd6ee66d4d50758a67277b320de87769a4722ab143b2f24cbb0e0d52f5aada +mtime: 1730817737 +commit: c0760b117fc40c177bf755bf33d8afcf98ad5dfa5af50e0556b3773a03b56f59 url: https://src.opensuse.org/pool/python-pygit2 revision: factory diff --git a/build.specials.obscpio b/build.specials.obscpio index 8a42595..2be0cc6 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a62b5149fe863f60bc19559e42c1372f634584c2b3e82a7103be03921ba94d87 -size 256 +oid sha256:62d7276b2f2c0d2ec7361743b1cdfb9b17354a28a6b0c0401d3fd4d146591148 +size 280 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 From c98ed5ffcb98d6da84256540085a126dd9eefd84d8d4e5fc33fff0cf10beb513 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 4 Feb 2025 08:51:26 +0000 Subject: [PATCH 3/6] [info=a5914906eaa05210f799fdf6fdcc42fdc17a603d103035bf6c26729334b00c0c] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pygit2?expand=0&rev=99 --- _scmsync.obsinfo | 4 ++-- build.specials.obscpio | 2 +- const-parents.patch | 27 --------------------------- pygit2-1.16.0.tar.gz | 3 --- pygit2-1.17.0.tar.gz | 3 +++ python-pygit2.changes | 15 +++++++++++++++ python-pygit2.spec | 5 +---- 7 files changed, 22 insertions(+), 37 deletions(-) delete mode 100644 const-parents.patch delete mode 100644 pygit2-1.16.0.tar.gz create mode 100644 pygit2-1.17.0.tar.gz diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 8675986..d9dd1a6 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1730817737 -commit: c0760b117fc40c177bf755bf33d8afcf98ad5dfa5af50e0556b3773a03b56f59 +mtime: 1738659081 +commit: a5914906eaa05210f799fdf6fdcc42fdc17a603d103035bf6c26729334b00c0c url: https://src.opensuse.org/pool/python-pygit2 revision: factory diff --git a/build.specials.obscpio b/build.specials.obscpio index 2be0cc6..81fd997 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62d7276b2f2c0d2ec7361743b1cdfb9b17354a28a6b0c0401d3fd4d146591148 +oid sha256:ed0c3fae9ccb7f3514e7ac6c73358e60bd8909553729f7cff91abdf1e3494b21 size 280 diff --git a/const-parents.patch b/const-parents.patch deleted file mode 100644 index 2669549..0000000 --- a/const-parents.patch +++ /dev/null @@ -1,27 +0,0 @@ - ---- - 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.16.0.tar.gz b/pygit2-1.16.0.tar.gz deleted file mode 100644 index 586d40d..0000000 --- a/pygit2-1.16.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7b29a6796baa15fc89d443ac8d51775411d9b1e5b06dc40d458c56c8576b48a2 -size 768597 diff --git a/pygit2-1.17.0.tar.gz b/pygit2-1.17.0.tar.gz new file mode 100644 index 0000000..069f030 --- /dev/null +++ b/pygit2-1.17.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa2bc050b2c2d3e73b54d6d541c792178561a344f07e409f532d5bb97ac7b894 +size 769002 diff --git a/python-pygit2.changes b/python-pygit2.changes index 9680a02..587223e 100644 --- a/python-pygit2.changes +++ b/python-pygit2.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Jan 29 13:52:23 UTC 2025 - Matej Cepl + +- Remove upstreamed const-parents.patch. + +------------------------------------------------------------------- +Tue Jan 28 09:21:54 UTC 2025 - Markéta Machová + +- Update to 1.17.0 + * Upgrade to libgit2 1.9 + * Add certificate_check callback to Remote.ls_remotes(...) + * Fix build with GCC 14 + * Documentation: fix typo in Repository.status(...) docstring + * Fix tests with Python 3.13.1 + ------------------------------------------------------------------- Tue Nov 5 10:50:38 UTC 2024 - Matej Cepl diff --git a/python-pygit2.spec b/python-pygit2.spec index 7f7f63e..9f7e44a 100644 --- a/python-pygit2.spec +++ b/python-pygit2.spec @@ -19,15 +19,12 @@ %{?sle15_python_module_pythons} Name: python-pygit2 -Version: 1.16.0 +Version: 1.17.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.17.0} From 57f128a6d68a348415667ac6d21f30e668240ead54f1e08a29ed099958c7032e Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 5 May 2025 06:38:29 +0000 Subject: [PATCH 4/6] [info=75d2cb71414110ccf67c23dc7b67ee0b99448d5a8d76a34fc70cd03e01433d4d] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pygit2?expand=0&rev=100 --- _scmsync.obsinfo | 6 +++--- build.specials.obscpio | 2 +- python-pygit2.spec | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index d9dd1a6..059e21b 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1738659081 -commit: a5914906eaa05210f799fdf6fdcc42fdc17a603d103035bf6c26729334b00c0c -url: https://src.opensuse.org/pool/python-pygit2 +mtime: 1746427090 +commit: 75d2cb71414110ccf67c23dc7b67ee0b99448d5a8d76a34fc70cd03e01433d4d +url: https://src.opensuse.org/mcepl/python-pygit2 revision: factory diff --git a/build.specials.obscpio b/build.specials.obscpio index 81fd997..9039853 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed0c3fae9ccb7f3514e7ac6c73358e60bd8909553729f7cff91abdf1e3494b21 +oid sha256:dee9ff8a0b9c433cb62b60d3dfa23f2920345ea271fe1c6fca6b6f647f5690a4 size 280 diff --git a/python-pygit2.spec b/python-pygit2.spec index 9f7e44a..ec6204a 100644 --- a/python-pygit2.spec +++ b/python-pygit2.spec @@ -1,7 +1,7 @@ # # spec file for package python-pygit2 # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # Copyright (c) 2019 Neal Gompa . # # All modifications and additions to the file contributed by third parties From 9ddaca0bf1f6806925e0f8afa95a5b12d8d7d8eb2a67868f3168bef73c930189 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 11 Aug 2025 17:57:46 +0000 Subject: [PATCH 5/6] Remove *.obs* files OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pygit2?expand=0&rev=101 --- _scmsync.obsinfo | 4 ---- build.specials.obscpio | 3 --- python-pygit2.spec | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 _scmsync.obsinfo delete mode 100644 build.specials.obscpio diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo deleted file mode 100644 index 059e21b..0000000 --- a/_scmsync.obsinfo +++ /dev/null @@ -1,4 +0,0 @@ -mtime: 1746427090 -commit: 75d2cb71414110ccf67c23dc7b67ee0b99448d5a8d76a34fc70cd03e01433d4d -url: https://src.opensuse.org/mcepl/python-pygit2 -revision: factory diff --git a/build.specials.obscpio b/build.specials.obscpio deleted file mode 100644 index 9039853..0000000 --- a/build.specials.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dee9ff8a0b9c433cb62b60d3dfa23f2920345ea271fe1c6fca6b6f647f5690a4 -size 280 diff --git a/python-pygit2.spec b/python-pygit2.spec index ec6204a..696946b 100644 --- a/python-pygit2.spec +++ b/python-pygit2.spec @@ -1,7 +1,7 @@ # # spec file for package python-pygit2 # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2025 SUSE LLC and contributors # Copyright (c) 2019 Neal Gompa . # # All modifications and additions to the file contributed by third parties From 572e3841f52e0ddb85e566f6796f5c037313d96de636732b34d3e210adfccd3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Tue, 2 Sep 2025 13:10:02 +0000 Subject: [PATCH 6/6] - Update to 1.18.2 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pygit2?expand=0&rev=102 --- pygit2-1.17.0.tar.gz | 3 --- pygit2-1.18.2.tar.gz | 3 +++ python-pygit2.changes | 51 +++++++++++++++++++++++++++++++++++++++++++ python-pygit2.spec | 5 +++-- 4 files changed, 57 insertions(+), 5 deletions(-) delete mode 100644 pygit2-1.17.0.tar.gz create mode 100644 pygit2-1.18.2.tar.gz diff --git a/pygit2-1.17.0.tar.gz b/pygit2-1.17.0.tar.gz deleted file mode 100644 index 069f030..0000000 --- a/pygit2-1.17.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa2bc050b2c2d3e73b54d6d541c792178561a344f07e409f532d5bb97ac7b894 -size 769002 diff --git a/pygit2-1.18.2.tar.gz b/pygit2-1.18.2.tar.gz new file mode 100644 index 0000000..3cfe62c --- /dev/null +++ b/pygit2-1.18.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eca87e0662c965715b7f13491d5e858df2c0908341dee9bde2bc03268e460f55 +size 797200 diff --git a/python-pygit2.changes b/python-pygit2.changes index 587223e..e3b7821 100644 --- a/python-pygit2.changes +++ b/python-pygit2.changes @@ -1,3 +1,54 @@ +------------------------------------------------------------------- +Tue Sep 2 10:47:35 UTC 2025 - Sangeetha Thackarajan + +- Update to 1.18.2 + 1.18.2 (2025-08-16) + ------------------------- + - Add support for almost all global options + - Now it's possible to set `Submodule.url = url` + - New `RemoteCallbacks.push_negotiation(...)` + - New optional boolean argument `connect` in `Remote.ls_remotes(...)` + - New `Remote.list_heads(...)` returns a list of `RemoteHead` objects + - Documentation fixes + - Typing improvements + Deprecations: + - `Remote.ls_remotes(...)` is deprecated, use `Remote.list_heads(...)` + + 1.18.1 (2025-07-26) + ------------------------- + - Update wheels to libgit2 1.9.1 and OpenSSL 3.3 + - New `Index.remove_directory(...)` + - New `Index.add_conflict(...)` + - Now `Repository.merge_file_from_index(...)` returns a `MergeFileResult` object when + called with `use_deprecated=False` + - Typing improvements + Deprecations: + - At some point in the future `use_deprecated=False` in `Repository.merge_file_from_index(..., use_deprecated=False)` will be the default. + + 1.18.0 (2025-04-24) + ------------------------- + - Upgrade Linux Glibc wheels to `manylinux_2_28` + - Add `RemoteCallbacks.push_transfer_progress(...)` callback + - New `bool(oid)` + - Now `Repository.merge(...)` accepts a commit or reference object + - New `threads` optional argument in `Remote.push(...)` + - New `proxy` optional argument in `clone_repository(...)` + - New optional arguments `context_lines` and `interhunk_lines` in `Blob.diff(...)` ; and + now `Repository.diff(...)` honors these two arguments when the objects diffed are blobs. + - Now `Tree.diff_to_workdir(...)` accepts keyword arguments, not just positional. + - Fix when a reference name has non UTF-8 chars + - Fix condition check in `Repository.remotes.rename(...)` + - Add codespell workflow, fix a number of typos + - Documentation and typing + - CI: Use ARM runner for tests and wheels + - Build and CI updates + Deprecations: + - Passing str to `Repository.merge(...)` is deprecated, + instead pass an oid object (or a commit, or a reference) + Breaking changes: + - Keyword argument `flag` has been renamed to `flags` in `Blob.diff(...)` and + `Blob.diff_to_buffer(...)` + ------------------------------------------------------------------- Wed Jan 29 13:52:23 UTC 2025 - Matej Cepl diff --git a/python-pygit2.spec b/python-pygit2.spec index 696946b..242da59 100644 --- a/python-pygit2.spec +++ b/python-pygit2.spec @@ -1,6 +1,7 @@ # # spec file for package python-pygit2 # +# Copyright (c) 2025 SUSE LLC # Copyright (c) 2025 SUSE LLC and contributors # Copyright (c) 2019 Neal Gompa . # @@ -19,7 +20,7 @@ %{?sle15_python_module_pythons} Name: python-pygit2 -Version: 1.17.0 +Version: 1.18.2 Release: 0 Summary: Python bindings for libgit2 License: GPL-2.0-only @@ -36,7 +37,7 @@ BuildRequires: %{python_module wheel} BuildRequires: ca-certificates BuildRequires: ca-certificates-mozilla BuildRequires: fdupes -BuildRequires: libgit2-devel >= 1.1 +BuildRequires: libgit2-devel >= 1.9.0 BuildRequires: libopenssl-devel BuildRequires: python-rpm-macros Requires: python-cached-property