Merge branch 'master' of https://github.com/libgit2/pygit2 into typec…

…heck
libgit2 · Jan 13, 2025 · 86c62cd · 86c62cd
2 parents f019420 + a011e26
commit 86c62cd
Show file tree

Hide file tree

Showing 129 changed files with 176 additions and 142 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,7 +7,7 @@ on:
     - '**.rst'
 
 jobs:
-  x86_64:
+  linux-x86_64:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -18,8 +18,6 @@ jobs:
           python-version: '3.13'
         - os: ubuntu-24.04
           python-version: 'pypy3.10'
-        - os: macos-latest
-          python-version: '3.10'
 
     steps:
     - name: Checkout pygit2
@@ -31,18 +29,11 @@ jobs:
         python-version: ${{ matrix.python-version }}
 
     - name: Linux
-      if: runner.os == 'Linux'
       run: |
         sudo apt install tinyproxy
         LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.0 /bin/sh build.sh test
 
-    - name: macOS
-      if: runner.os == 'macOS'
-      run: |
-        export OPENSSL_PREFIX=`brew --prefix [email protected]`
-        LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.0 /bin/sh build.sh test
-
-  aarch64:
+  linux-arm64:
     runs-on: ubuntu-24.04
     steps:
     - name: Checkout
@@ -59,7 +50,7 @@ jobs:
         run: |
           LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.0 /bin/sh build.sh test
 
-  s390x:
+  linux-s390x:
     runs-on: ubuntu-24.04
     if: github.ref == 'refs/heads/master'
     steps:
@@ -77,3 +68,19 @@ jobs:
         run: |
           LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.0 /bin/sh build.sh test
       continue-on-error: true # Tests are expected to fail, see issue #812
+
+  macos-arm64:
+    runs-on: macos-latest
+    steps:
+    - name: Checkout pygit2
+      uses: actions/checkout@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.13'
+
+    - name: macOS
+      run: |
+        export OPENSSL_PREFIX=`brew --prefix openssl@3`
+        LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.0 /bin/sh build.sh test
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -17,22 +17,22 @@ jobs:
         - name: linux
           os: ubuntu-24.04
         - name: macos
-          os: macos-12
+          os: macos-13
 
     steps:
       - uses: actions/checkout@v4
 
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.11'
 
       - uses: docker/setup-qemu-action@v3
         if: runner.os == 'Linux'
         with:
           platforms: all
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.21.3
+        run: python -m pip install cibuildwheel==2.22.0
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse

diff --git a/AUTHORS.md b/AUTHORS.md
@@ -111,6 +111,7 @@ Authors:
     Kaarel Kitsemets
     Ken Dreyer
     Kevin KIN-FOO
+    Kyle Gottfried
     Marcel Waldvogel
     Masud Rahman
     Mathieu Parent
@@ -174,10 +175,12 @@ Authors:
     Jasper Lievisse Adriaanse
     Jimisola Laursen
     Jiri Benc
+    Johann Miller
     Jonathan Robson
     Josh Bleecher Snyder
     Julia Evans
     Justin Clift
+    Kevin Valk
     Konstantinos Smanis
     Kyriakos Oikonomakos
     Lance Eftink
@@ -187,6 +190,7 @@ Authors:
     Mathieu Bridon
     Mathieu Pillard
     Matthaus Woolard
+    Matěj Cepl
     Maxwell G
     Michał Górny
     Na'aman Hirschfeld
@@ -208,6 +212,7 @@ Authors:
     Rodrigo Bistolfi
     Ross Nicoll
     Rui Abreu Ferreira
+    Rui Chen
     Sandro Jäckel
     Saul Pwanson
     Shane Turner

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,24 @@
+# 1.17.0 (2025-01-08)
+
+- Upgrade to libgit2 1.9
+
+- Add `certificate_check` callback to `Remote.ls_remotes(...)`
+  [#1326](https://github.com/libgit2/pygit2/pull/1326)
+
+- Fix build with GCC 14
+  [#1324](https://github.com/libgit2/pygit2/pull/1324)
+
+- Release wheels for PyPy
+  [#1336](https://github.com/libgit2/pygit2/pull/1336)
+  [#1339](https://github.com/libgit2/pygit2/pull/1339)
+
+- CI: update tests for macOS to use OpenSSL 3
+  [#1335](https://github.com/libgit2/pygit2/pull/1335)
+
+- Documentation: fix typo in `Repository.status(...)` docstring
+  [#1327](https://github.com/libgit2/pygit2/pull/1327)
+
+
 # 1.16.0 (2024-10-11)
 
 - Add support for Python 3.13

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 1.16.{build}
+version: 1.17.{build}
 image: Visual Studio 2019
 configuration: Release
 environment:

diff --git a/docs/conf.py b/docs/conf.py
@@ -18,11 +18,11 @@
 # -- Project information -----------------------------------------------------
 
 project = 'pygit2'
-copyright = '2010-2024 The pygit2 contributors'
+copyright = '2010-2025 The pygit2 contributors'
 # author = ''
 
 # The full version, including alpha/beta/rc tags
-release = '1.16.0'
+release = '1.17.0'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/pygit2/__init__.py b/pygit2/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,

diff --git a/pygit2/_build.py b/pygit2/_build.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,
@@ -34,7 +34,7 @@
 #
 # The version number of pygit2
 #
-__version__ = '1.16.0'
+__version__ = '1.17.0'
 
 
 #

diff --git a/pygit2/_run.py b/pygit2/_run.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,

diff --git a/pygit2/blame.py b/pygit2/blame.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,

diff --git a/pygit2/branches.py b/pygit2/branches.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,

diff --git a/pygit2/callbacks.py b/pygit2/callbacks.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,

diff --git a/pygit2/config.py b/pygit2/config.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,

diff --git a/pygit2/credentials.py b/pygit2/credentials.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,

diff --git a/pygit2/enums.py b/pygit2/enums.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,

diff --git a/pygit2/errors.py b/pygit2/errors.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,

diff --git a/pygit2/ffi.py b/pygit2/ffi.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,

diff --git a/pygit2/filter.py b/pygit2/filter.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,

diff --git a/pygit2/index.py b/pygit2/index.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,

diff --git a/pygit2/legacyenums.py b/pygit2/legacyenums.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,

diff --git a/pygit2/packbuilder.py b/pygit2/packbuilder.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,

diff --git a/pygit2/references.py b/pygit2/references.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,

diff --git a/pygit2/refspec.py b/pygit2/refspec.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,

diff --git a/pygit2/remotes.py b/pygit2/remotes.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,

diff --git a/pygit2/repository.py b/pygit2/repository.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,

diff --git a/pygit2/settings.py b/pygit2/settings.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,

diff --git a/pygit2/submodules.py b/pygit2/submodules.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,

diff --git a/pygit2/utils.py b/pygit2/utils.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,

diff --git a/pyproject.toml b/pyproject.toml
@@ -2,7 +2,8 @@
 requires = ["setuptools", "wheel"]
 
 [tool.cibuildwheel]
-skip = "pp3* *musllinux_aarch64 *musllinux_ppc64le"
+enable = ["pypy"]
+skip = "*musllinux_aarch64 *musllinux_ppc64le"
 
 archs = ["auto"]
 build-frontend = "default"

diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 The pygit2 contributors
+# Copyright 2010-2025 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,

diff --git a/src/blob.c b/src/blob.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2024 The pygit2 contributors
+ * Copyright 2010-2025 The pygit2 contributors
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2,

diff --git a/src/branch.c b/src/branch.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2024 The pygit2 contributors
+ * Copyright 2010-2025 The pygit2 contributors
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2,

diff --git a/src/branch.h b/src/branch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2024 The pygit2 contributors
+ * Copyright 2010-2025 The pygit2 contributors
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2,

diff --git a/src/commit.c b/src/commit.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2024 The pygit2 contributors
+ * Copyright 2010-2025 The pygit2 contributors
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2,

diff --git a/src/diff.c b/src/diff.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2024 The pygit2 contributors
+ * Copyright 2010-2025 The pygit2 contributors
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2,

diff --git a/src/diff.h b/src/diff.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2024 The pygit2 contributors
+ * Copyright 2010-2025 The pygit2 contributors
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2,

diff --git a/src/error.c b/src/error.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2024 The pygit2 contributors
+ * Copyright 2010-2025 The pygit2 contributors
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2,

diff --git a/src/error.h b/src/error.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2024 The pygit2 contributors
+ * Copyright 2010-2025 The pygit2 contributors
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2,

diff --git a/src/filter.c b/src/filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2024 The pygit2 contributors
+ * Copyright 2010-2025 The pygit2 contributors
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2,