Update to libgit2 v1.9.4 and fix wheels

Author: jdavid

.github/workflows/lint.yml

@@ -31,4 +31,4 @@ jobs:
       run: ruff check
 
     - name: Check typing with mypy
-      run: LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.2 /bin/sh build.sh mypy
+      run: LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.4 /bin/sh build.sh mypy

.github/workflows/tests.yml

@@ -25,5 +25,5 @@ jobs:
           apt-get update -q -y
           apt-get install -q -y cmake libssl-dev python3-dev python3-venv wget
         run: |
-          LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.2 /bin/sh build.sh test
+          LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.4 /bin/sh build.sh test
       continue-on-error: true # Tests are expected to fail, see issue #812

.github/workflows/wheels.yml

@@ -125,7 +125,7 @@ jobs:
         run: python -m cibuildwheel dist/*.tar.gz --output-dir wheelhouse
         env:
           CIBW_ARCHS: ppc64le
-          CIBW_ENVIRONMENT: LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.2 LIBGIT2=/project/ci
+          CIBW_ENVIRONMENT: LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.4 LIBGIT2=/project/ci
 
       - uses: actions/upload-artifact@v7
         with:

Makefile

@@ -1,7 +1,7 @@
 .PHONY: build html
 
 build:
-	OPENSSL_VERSION=3.5.4 LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.2 sh build.sh
+	OPENSSL_VERSION=3.5.4 LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.4 sh build.sh
 
 html: build
 	make -C docs html

build.sh

@@ -22,14 +22,14 @@
 #
 #   sh build.sh
 #
-# Build libgit2 1.9.2 (will use libssh2 if available), then build pygit2
+# Build libgit2 1.9.4 (will use libssh2 if available), then build pygit2
 # inplace:
 #
-#   LIBGIT2_VERSION=1.9.2 sh build.sh
+#   LIBGIT2_VERSION=1.9.4 sh build.sh
 #
-# Build libssh2 1.11.1 and libgit2 1.9.2, then build pygit2 inplace:
+# Build libssh2 1.11.1 and libgit2 1.9.4, then build pygit2 inplace:
 #
-#   LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.2 sh build.sh
+#   LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.4 sh build.sh
 #
 # Build inplace and run the tests:
 #

docs/install.rst

@@ -158,9 +158,9 @@ directory, do:
 .. code-block:: sh
    :caption: On Linux using bash
 
-   wget https://github.com/libgit2/libgit2/archive/refs/tags/v1.9.2.tar.gz -O libgit2-1.9.2.tar.gz
-   tar -xzf libgit2-1.9.2.tar.gz
-   cd libgit2-1.9.2/
+   wget https://github.com/libgit2/libgit2/archive/refs/tags/v1.9.4.tar.gz -O libgit2-1.9.4.tar.gz
+   tar -xzf libgit2-1.9.4.tar.gz
+   cd libgit2-1.9.4/
    cmake .
    make
    sudo make install
@@ -245,9 +245,9 @@ Install libgit2 (see we define the installation prefix):
 .. code-block:: sh
    :caption: On Linux using bash
 
-   wget https://github.com/libgit2/libgit2/archive/refs/tags/v1.9.2.tar.gz -O libgit2-1.9.2.tar.gz
-   tar xzf libgit2-1.9.2.tar.gz
-   cd libgit2-1.9.2/
+   wget https://github.com/libgit2/libgit2/archive/refs/tags/v1.9.4.tar.gz -O libgit2-1.9.4.tar.gz
+   tar xzf libgit2-1.9.4.tar.gz
+   cd libgit2-1.9.4/
    cmake . -DCMAKE_INSTALL_PREFIX=$LIBGIT2
    cmake --build . --target install
 
@@ -307,7 +307,7 @@ variable.  The following recipe shows you how to do it:
 .. code-block:: pwsh
    :caption: On Windows using PowerShell (and CMake v3.21 or newer)
 
-   git clone --depth=1 -b v1.9.2 https://github.com/libgit2/libgit2.git
+   git clone --depth=1 -b v1.9.4 https://github.com/libgit2/libgit2.git
    $env:CMAKE_INSTALL_PREFIX = "C:/Dev/libgit2"
    $env:CMAKE_GENERATOR = "Visual Studio 17 2022"
    $env:CMAKE_GENERATOR_PLATFORM = "x64" # or "Win32" or "ARM64"

pyproject.toml

@@ -9,10 +9,9 @@ skip = "*musllinux_ppc64le"
 archs = ["native"]
 build-frontend = "default"
 dependency-versions = "pinned"
-environment = {LIBGIT2_VERSION="1.9.2", LIBSSH2_VERSION="1.11.1", OPENSSL_VERSION="3.5.4"}
+environment = {LIBGIT2="$(pwd)/ci", LIBGIT2_VERSION="1.9.4", LIBSSH2_VERSION="1.11.1", OPENSSL_VERSION="3.5.4"}
 
 before-all = "sh build.sh"
-before-build = "export LIBGIT2='{package}/ci'"
 test-command = "pytest"
 test-sources = ["test", "pytest.ini"]
 before-test = "pip install -r {package}/requirements-test.txt"
@@ -33,7 +32,7 @@ repair-wheel-command = "DYLD_LIBRARY_PATH={package}/ci/lib delocate-wheel --requ
 
 [tool.cibuildwheel.windows]
 environment.LIBGIT2_SRC = "build/libgit2_src"
-environment.LIBGIT2_VERSION = "1.9.2"
+environment.LIBGIT2_VERSION = "1.9.4"
 before-all = "powershell -File build.ps1"
 before-build = ""