pygit2 1.19.3__tar.gz → 1.20.1__tar.gz

{pygit2-1.19.3 → pygit2-1.20.1}/AGENTS.md

@@ -11,7 +11,7 @@ and a high-level, Pythonic API for repository manipulation.
 - **License**: GPLv2 with linking exception (see `COPYING`)
 - **Maintainer**: J. David Ibáñez
 - **Python Support**: 3.11 – 3.14 and PyPy3 7.3+
-- **libgit2 Version**: 1.9.4
+- **libgit2 Version**: 1.9.7
 - **Homepage**: <https://www.pygit2.org/>
 - **Repository**: <https://github.com/libgit2/pygit2>
 
@@ -56,8 +56,8 @@ modules:
     `repository.py`, `callbacks.py`, `config.py`, `index.py`, `remotes.py`,
     `settings.py`, `submodules.py`, `transaction.py`, `filter.py`, `blob.py`,
     `blame.py`, `branches.py`, `credentials.py`, `errors.py`, `options.py`,
-    `packbuilder.py`, `references.py`, `refspec.py`, `utils.py`, `enums.py`,
-    `legacyenums.py`.
+    `packbuilder.py`, `rebase.py`, `references.py`, `refspec.py`, `utils.py`,
+    `enums.py`.
 
 - **`test/`** — pytest suite with fixture-based repository handling.
 - **`docs/`** — Sphinx documentation (RTD theme).
@@ -65,7 +65,8 @@ modules:
 ## Key Configuration Files
 
 - **`setup.py`** — setuptools entry point. Builds both the C extension
-  (`src/*.c`) and the CFFI extension (`pygit2/_run.py:ffi`).
+  (`src/*.c`) and the CFFI extension (`pygit2/_run.py:ffi`). On Windows it
+  also copies `git2.dll` into the package (see `BuildWithDLLs`).
 - **`pyproject.toml`** — Build-system requirements, `cibuildwheel`
   configuration, `ruff` settings, and `codespell` settings.
 - **`setup.cfg`** — Legacy pycodestyle configuration.
@@ -73,7 +74,7 @@ modules:
   `testpaths = test/`).
 - **`mypy.ini`** — mypy configuration with strict settings.
 - **`mypy-stubtest.ini`** — mypy configuration for `stubtest` against
-  `_pygit2.pyi`.
+  `_pygit2.pyi` (at the repo root).
 - **`requirements.txt`** — Runtime/build requirements (`cffi>=2.0`,
   `setuptools` for Python >= 3.12).
 - **`requirements-test.txt`** — Test requirements (`pytest`, `pytest-cov`).
@@ -106,16 +107,14 @@ handles libgit2 compilation via CMake.
 make
 
 # Or manually:
-LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.4 sh build.sh
+LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.7 sh build.sh
 
-# Build inplace and run the tests
-sh build.sh test
-
-# Build a wheel, install it, and run the tests
+# Build a wheel and bundle the shared libraries into it
 sh build.sh wheel
+sh build.sh bundle
 
-# Run tests with coverage
-sh build.sh test   # build.sh adds --cov=pygit2
+# Build inplace and run the tests with coverage (build.sh adds --cov=pygit2)
+sh build.sh test
 
 # Run mypy type checking
 sh build.sh mypy
@@ -140,8 +139,8 @@ Variables consumed by `build.sh`:
 
 - `LIBGIT2_VERSION` — If set, download and build this libgit2 version.
 - `LIBSSH2_VERSION` — If set, download and build libssh2 with SSH support.
-- `OPENSSL_VERSION` — If set, download and build OpenSSL (mainly used for
-  macOS universal builds on CI).
+- `OPENSSL_VERSION` — If set, download and build OpenSSL (used on Linux and
+  macOS CI builds).
 - `ZLIB_VERSION` — If set, download and build zlib.
 - `BUILD_TYPE` — CMake build type (default: `Debug`).
 - `PYTHON` — Python interpreter to use (default: `python3`).
@@ -167,7 +166,12 @@ make -C docs html   # requires sphinx-rtd-theme
   - Target Python: 3.11+
   - Quote style: single quotes
   - Selected rules: `E4`, `E7`, `E9`, `F`, `I`, `UP035`, `UP007`
-- **Type checker**: mypy (strict settings enabled; see `mypy.ini`)
+  - Run `ruff format` and `ruff check` on changed files before committing.
+    CI runs `ruff format --diff` and `ruff check`; formatting failures will
+    fail the build.
+- **Type checker**: mypy (strict settings enabled; see `mypy.ini`). Test
+  modules additionally require typed defs and calls (`disallow_untyped_defs`,
+  `disallow_untyped_calls` under `[mypy-test.*]`).
 - All Python source files must include the standard GPLv2 copyright header.
 - `pygit2/__init__.py` is large because it re-exports a large surface of
   constants and classes; follow existing patterns when adding new public
@@ -233,23 +237,28 @@ def f(a, b):
 GitHub Actions workflows live in `.github/workflows/`:
 
 - **`tests.yml`** — Runs on s390x via QEMU (`uraimo/run-on-arch-action`).
-  Allowed to fail; see issue #812.
+  Allowed to fail (`continue-on-error`); see issue #812.
 - **`lint.yml`** — Runs `ruff format --diff`, `ruff check`, and
   `sh build.sh mypy`.
-- **`wheels.yml`** — Uses `cibuildwheel` to build wheels for Linux (amd64,
-  arm64, ppc64le, musl), macOS (intel, arm64, PyPy), and Windows (x64, x86,
-  arm64). It also builds an sdist, runs a `twine check`, publishes to PyPI,
-  and creates a GitHub Release on version tags (`v*`).
+- **`wheels.yml`** — Uses `cibuildwheel` (`~=3.3`) to build wheels for Linux
+  (amd64, arm64, ppc64le and riscv64 via QEMU, musl), macOS (intel, arm64,
+  PyPy), and Windows (x64, x86, arm64). Linux, macOS and Windows jobs cache
+  the compiled dependencies between runs. It also builds an sdist, runs a
+  `twine check` (skipped on version tags), publishes to PyPI, and creates a
+  GitHub Release on version tags (`v*`), with release notes parsed from
+  `CHANGELOG.md` by `.github/workflows/parse_release_notes.py`.
 - **`codespell.yml`** — Spell checking with the codespell action.
 
 The `cibuildwheel` configuration in `pyproject.toml` pins:
 
-- `LIBGIT2_VERSION="1.9.4"`
+- `LIBGIT2_VERSION="1.9.7"`
 - `LIBSSH2_VERSION="1.11.1"`
-- `OPENSSL_VERSION="3.5.4"`
+- `OPENSSL_VERSION="3.5.7"`
 
-and skips `*musllinux_ppc64le` plus testing on `*-*linux_ppc64le` and
-`pp*-macosx_arm64`.
+and skips `*musllinux_ppc64le` plus testing on `*-*linux_ppc64le`,
+`*-*linux_riscv64` and `pp*-macosx_arm64`. On Windows it uses the
+`Visual Studio 18 2026` CMake generator for x64/x86 and
+`Visual Studio 17 2022` for ARM64.
 
 ## Security Considerations
 
@@ -262,6 +271,12 @@ and skips `*musllinux_ppc64le` plus testing on `*-*linux_ppc64le` and
 - Valgrind support: see `docs/development.rst` and
   `misc/valgrind-python.supp` for memory-leak debugging instructions.
 
+## Git Commits
+
+- Do not run `git commit` or create commits unless the user explicitly asks for it.
+- Commits created by an AI agent must end with the `Assisted-by:` trailer.
+  Human-authored commits do not need it.
+
 ## Useful Notes for Agents
 
 - **Do not assume libgit2 is installed globally.** Check for `LIBGIT2` or use
@@ -275,5 +290,6 @@ and skips `*musllinux_ppc64le` plus testing on `*-*linux_ppc64le` and
   extension. Keep it in sync when adding or changing low-level APIs.
 - **Header stub order matters**: `pygit2/_run.py` concatenates `decl/*.h` in a
   fixed list; add new stubs in the correct position if dependencies require it.
-- Run the full test suite and type checks before considering a change complete:
-  `sh build.sh test` and `sh build.sh mypy`.
+- Run the full test suite, type checks, and linting/formatting before
+  considering a change complete:
+  `sh build.sh test`, `sh build.sh mypy`, `ruff check .`, and `ruff format .`.

{pygit2-1.19.3 → pygit2-1.20.1}/AUTHORS.md

@@ -21,6 +21,7 @@ Authors:
     Nick Hynes
     Richard Möhn
     Xu Tao
+    Łukasz Langa
     Konstantin Baikov
     Matthew Duggan
     Matthew Gamble
@@ -30,7 +31,6 @@ Authors:
     Sriram Raghu
     Victor Garcia
     Yonggang Luo
-    Łukasz Langa
     Patrick Steinhardt
     Petr Hosek
     Tamir Bahar
@@ -44,6 +44,7 @@ Authors:
     Nabijacz Leweli
     Simon Cozens
     Vlad Temian
+    WANG Xuerui
     Brodie Rao
     Chad Dombrova
     Lukas Fleischer
@@ -65,7 +66,6 @@ Authors:
     Santiago Perez De Rosso
     Sebastian Thiel
     Thom Wiggers
-    WANG Xuerui
     William Manley
     Alexander Linne
     Alok Singhal
@@ -126,7 +126,9 @@ Authors:
     Marcel Waldvogel
     Masud Rahman
     Michael Sondergaard
+    Michal Koutný
     Natanael Arndt
+    Nick Williams
     Ondřej Nový
     Sarath Lakshman
     Steve Kieffer
@@ -200,6 +202,7 @@ Authors:
     Lance Eftink
     Legorooj
     Lukas Berk
+    Marius Gedminas
     Martin von Zweigbergk
     Mathieu Bridon
     Mathieu Pillard
@@ -226,6 +229,7 @@ Authors:
     Remy Suen
     Ridge Kennedy
     Rodrigo Bistolfi
+    Roshan Ramani
     Ross Nicoll
     Rui Abreu Ferreira
     Rui Chen
@@ -242,6 +246,7 @@ Authors:
     Victor Florea
     Vladimir Rutsky
     Vruyr Gyolchanyan
+    William Bowers
     William Schueller
     Wim Jeantine-Glenn
     Yu Jianjian

{pygit2-1.19.3 → pygit2-1.20.1}/CHANGELOG.md

@@ -1,3 +1,96 @@
+# 1.20.1 (2026-09-12)
+
+- Update wheels to libgit2 1.9.7
+
+- New exception hierarchy: `AlreadyExistsError`, `InvalidSpecError`,
+  `InvalidError`, `NotFoundError`, `AmbiguousError`, `AuthError`, and
+  `CertificateError` all inherit from `GitError` and the appropriate Python
+  built-in exception (`ValueError`/`KeyError`) for backward compatibility
+  [#830](https://github.com/libgit2/pygit2/issues/830)
+
+- Fix `DiffDelta.is_binary` and `DiffDelta.flags` returning stale values for
+  deltas obtained from `Diff.deltas`; flags are now loaded lazily
+  [#962](https://github.com/libgit2/pygit2/issues/962)
+  [#1100](https://github.com/libgit2/pygit2/pull/1100)
+
+- Fix `repo.submodules.get()` and `name in repo.submodules` raising
+  `AlreadyExistsError` when a repository exists at the submodule path but was
+  never registered as a submodule; they now return `None` and `False`
+  respectively as documented
+  [#1487](https://github.com/libgit2/pygit2/pull/1487)
+
+- Fix `BlobIO` cleanup deadlock on partial reads
+  [#1488](https://github.com/libgit2/pygit2/issues/1488)
+  [#1491](https://github.com/libgit2/pygit2/pull/1491)
+
+- Fix leaks and crashes in error paths
+  [#1478](https://github.com/libgit2/pygit2/issues/1478)
+  [#1479](https://github.com/libgit2/pygit2/issues/1479)
+  [#1480](https://github.com/libgit2/pygit2/issues/1480)
+  [#1481](https://github.com/libgit2/pygit2/issues/1481)
+
+- Fix custom ODB and refdb backend callbacks overwriting a pending Python
+  exception (e.g. `RuntimeError`) with a stale libgit2 error message.
+
+- Documentation fixes
+  [#1490](https://github.com/libgit2/pygit2/pull/1490)
+
+- CI (macOS): build architecture-specific OpenSSL/libssh2/libgit2
+  dependencies instead of universal binaries, producing smaller wheels.
+
+
+# 1.20.0 (2026-08-08)
+
+- New `RemoteCallbacks.custom_headers()`
+  [#1465](https://github.com/libgit2/pygit2/pull/1465)
+
+- New rebase API: `Repository.rebase_init(...)`, `Repository.rebase_open(...)`,
+  `Rebase`, and `RebaseOperation`
+  [#1483](https://github.com/libgit2/pygit2/pull/1483)
+
+- Fix `Config.snapshot()` for non-repository configs, allow `PathLike` in
+  `Config.__init__()`, and improve config documentation
+  [#1468](https://github.com/libgit2/pygit2/pull/1468)
+
+- Fix `UnicodeDecodeError` with non-UTF-8 file paths in `Repository.status()`,
+  `DiffFile.path`, index paths, checkout callbacks, and related APIs
+  [#1451](https://github.com/libgit2/pygit2/issues/1451)
+  [#1469](https://github.com/libgit2/pygit2/pull/1469)
+
+- Fix `enums.CheckoutStrategy.CONFLICT_STYLE_ZDIFF3`, which was mistakenly
+  bound to the `DIFF3` constant
+  [#1483](https://github.com/libgit2/pygit2/pull/1483)
+
+- Fix crashes and reference-lifetime bugs in custom refdb backends
+  [#1471](https://github.com/libgit2/pygit2/issues/1471)
+  [#1474](https://github.com/libgit2/pygit2/issues/1474)
+  [#1475](https://github.com/libgit2/pygit2/issues/1475)
+  [#1476](https://github.com/libgit2/pygit2/issues/1476)
+
+- Update wheels to libgit2 1.9.6 and OpenSSL 3.5.7
+
+- Add riscv64 wheels
+  [#1463](https://github.com/libgit2/pygit2/pull/1463)
+
+Breaking changes:
+
+- Remove deprecated `pygit2.legacyenums` module and `GIT_*` constants,
+  use `pygit2.enums` instead
+
+- Remove deprecated support for passing `str` to `Repository.merge(...)`,
+  pass a `Commit`, `Oid`, or `Reference` object instead
+
+- `Repository.merge_file_from_index(...)` now returns `MergeFileResult` by
+  default; pass `use_deprecated=True` for the previous string return, now
+  deprecated.
+
+- Remove deprecated `Remote.ls_remotes(...)`, use `Remote.list_heads(...)`
+  instead
+
+- Remove `pygit2.to_bytes(...)` and `pygit2.to_str(...)`; they were undocumented
+  accidental public APIs
+
+
 # 1.19.3 (2026-06-13)
 
 - Memory fixes

pygit2-1.20.1/Makefile

@@ -0,0 +1,7 @@
+.PHONY: build html
+
+build:
+	OPENSSL_VERSION=3.5.7 LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.7 sh build.sh
+
+html: build
+	make -C docs html

{pygit2-1.19.3 → pygit2-1.20.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygit2
-Version: 1.19.3
+Version: 1.20.1
 Summary: Python bindings for libgit2.
 Home-page: https://github.com/libgit2/pygit2
 Maintainer: J. David Ibáñez

{pygit2-1.19.3 → pygit2-1.20.1}/SPONSORS.md

@@ -1,5 +1,7 @@
 Friends of pygit2:
 
+- [William Bowers](https://github.com/ralian)
+
 - Add your name to the list,
   [become a friend of pygit2](https://github.com/sponsors/jdavid).
 

pygit2-1.20.1/build.ps1

@@ -0,0 +1,51 @@
+$ErrorActionPreference = 'Stop'
+
+$LIBGIT2_VERSION = $env:LIBGIT2_VERSION
+$LIBGIT2_SRC = $env:LIBGIT2_SRC
+if (-not $LIBGIT2_SRC) {
+    $LIBGIT2_SRC = "build/libgit2_src"
+}
+
+# Prefer CMAKE_INSTALL_PREFIX, then LIBGIT2, then the default Program Files location.
+$INSTALL_PREFIX = $env:CMAKE_INSTALL_PREFIX
+if (-not $INSTALL_PREFIX) {
+    $INSTALL_PREFIX = $env:LIBGIT2
+}
+if (-not $INSTALL_PREFIX) {
+    $INSTALL_PREFIX = "$env:ProgramFiles\libgit2"
+}
+
+# Use cached dependencies if they match the requested version.
+if ((Test-Path -Path "$INSTALL_PREFIX\versions.txt") -and $LIBGIT2_VERSION) {
+    $cached = Get-Content "$INSTALL_PREFIX\versions.txt"
+    $matches = $cached | Select-String "^LIBGIT2_VERSION=$LIBGIT2_VERSION$"
+    if ($matches) {
+        Write-Host "Using cached dependencies"
+        exit 0
+    }
+}
+
+if (!(Test-Path -Path "build")) {
+    # in case the pygit2 package build/ workspace has not been created by cibuildwheel yet
+    mkdir build
+}
+if (Test-Path -Path "$LIBGIT2_SRC") {
+    Set-Location "$LIBGIT2_SRC"
+    # for local runs, reuse build/libgit_src if it exists
+    if (Test-Path -Path build) {
+        # purge previous build env (likely for a different arch type)
+        Remove-Item -Recurse -Force build
+    }
+    # ensure we are checked out to the right version
+    git fetch --depth=1 --tags
+    git checkout "v$LIBGIT2_VERSION"
+} else {
+    # from a fresh run (like in CI)
+    git clone --depth=1 -b "v$LIBGIT2_VERSION" https://github.com/libgit2/libgit2.git $LIBGIT2_SRC
+    Set-Location "$LIBGIT2_SRC"
+}
+cmake -B build -S . -DBUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX"
+cmake --build build/ --config=Release --target install
+
+# Record version so the cache can be reused.
+"LIBGIT2_VERSION=$LIBGIT2_VERSION" | Set-Content "$INSTALL_PREFIX\versions.txt" -NoNewline

{pygit2-1.19.3 → pygit2-1.20.1}/build.sh

@@ -14,7 +14,7 @@
 #   LIBSSH2_VERSION=<Version> - Build the given version of libssh2
 #   LIBGIT2_VERSION=<Version> - Build the given version of libgit2
 #   OPENSSL_VERSION=<Version> - Build the given version of OpenSSL
-#                               (only needed for Mac universal on CI)
+#                               (used on Linux and macOS CI builds)
 #
 # Examples.
 #
@@ -22,14 +22,14 @@
 #
 #   sh build.sh
 #
-# Build libgit2 1.9.4 (will use libssh2 if available), then build pygit2
+# Build libgit2 1.9.7 (will use libssh2 if available), then build pygit2
 # inplace:
 #
-#   LIBGIT2_VERSION=1.9.4 sh build.sh
+#   LIBGIT2_VERSION=1.9.7 sh build.sh
 #
-# Build libssh2 1.11.1 and libgit2 1.9.4, then build pygit2 inplace:
+# Build libssh2 1.11.1 and libgit2 1.9.7, then build pygit2 inplace:
 #
-#   LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.4 sh build.sh
+#   LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.7 sh build.sh
 #
 # Build inplace and run the tests:
 #
@@ -82,8 +82,20 @@ if [ "$CIBUILDWHEEL" = "1" ]; then
             apk add --no-cache perl
         fi
     fi
-    rm -rf ci
-    mkdir ci || true
+
+    # Use cached dependencies if they match the requested versions.
+    if [ -f ci/versions.txt ] && \
+       grep -q "^LIBGIT2_VERSION=$LIBGIT2_VERSION$" ci/versions.txt && \
+       grep -q "^LIBSSH2_VERSION=$LIBSSH2_VERSION$" ci/versions.txt && \
+       grep -q "^OPENSSL_VERSION=$OPENSSL_VERSION$" ci/versions.txt; then
+        echo "Using cached dependencies"
+        exit 0
+    fi
+
+    # The ci directory may be a bind-mount (e.g. inside cibuildwheel), so
+    # remove its contents but keep the directory itself.
+    rm -rf ci/* ci/.[!.]* ci/..?* 2>/dev/null || true
+    mkdir -p ci
     cd ci
 else
     # Create a virtual environment
@@ -110,31 +122,24 @@ if [ -n "$OPENSSL_VERSION" ]; then
     wget https://www.openssl.org/source/$FILENAME.tar.gz -N --no-check-certificate
 
     if [ "$KERNEL" = "Darwin" ]; then
+        # Build OpenSSL for the host architecture only.
         tar xf $FILENAME.tar.gz
-        mv $FILENAME openssl-x86
-
-        tar xf $FILENAME.tar.gz
-        mv $FILENAME openssl-arm
-
-        cd openssl-x86
-        ./Configure darwin64-x86_64-cc shared
-        make
-        cd ../openssl-arm
-        ./Configure enable-rc5 zlib darwin64-arm64-cc no-asm
+        cd $FILENAME
+        if [ "$ARCH" = "arm64" ]; then
+            ./Configure enable-rc5 zlib darwin64-arm64-cc no-asm shared --prefix=$PREFIX --libdir=$PREFIX/lib
+        else
+            ./Configure darwin64-x86_64-cc shared --prefix=$PREFIX --libdir=$PREFIX/lib
+        fi
         make
-        cd ..
-
-        mkdir openssl-universal
-
-        LIBSSL=$(basename openssl-x86/libssl.*.dylib)
-        lipo -create openssl-x86/libssl.*.dylib openssl-arm/libssl.*.dylib -output openssl-universal/$LIBSSL
-        LIBCRYPTO=$(basename openssl-x86/libcrypto.*.dylib)
-        lipo -create openssl-x86/libcrypto.*.dylib openssl-arm/libcrypto.*.dylib -output openssl-universal/$LIBCRYPTO
-        cd openssl-universal
-        install_name_tool -id "@rpath/$LIBSSL" $LIBSSL
-        install_name_tool -id "@rpath/$LIBCRYPTO" $LIBCRYPTO
-        OPENSSL_PREFIX=$(pwd)
-        cd ..
+        make install
+        OPENSSL_PREFIX=$PREFIX
+        # Set install names so delocate can bundle the libraries.
+        cd $PREFIX/lib
+        LIBSSL=$(find . -maxdepth 1 -name 'libssl.*.dylib' -type f | head -n1 | sed 's|^\./||')
+        LIBCRYPTO=$(find . -maxdepth 1 -name 'libcrypto.*.dylib' -type f | head -n1 | sed 's|^\./||')
+        install_name_tool -id "@rpath/$LIBSSL" "$LIBSSL"
+        install_name_tool -id "@rpath/$LIBCRYPTO" "$LIBCRYPTO"
+        cd ../..
     else
         # Linux
         tar xf $FILENAME.tar.gz
@@ -154,14 +159,11 @@ if [ -n "$LIBSSH2_VERSION" ]; then
     tar xf $FILENAME.tar.gz
     cd $FILENAME
     if [ "$KERNEL" = "Darwin" ] && [ "$CIBUILDWHEEL" = "1" ]; then
-        cmake . \
+        CMAKE_PREFIX_PATH=$PREFIX cmake . \
                 -DCMAKE_INSTALL_PREFIX=$PREFIX \
                 -DBUILD_SHARED_LIBS=ON \
                 -DBUILD_EXAMPLES=OFF \
-                -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
-                -DOPENSSL_CRYPTO_LIBRARY="../openssl-universal/$LIBCRYPTO" \
-                -DOPENSSL_SSL_LIBRARY="../openssl-universal/$LIBSSL" \
-                -DOPENSSL_INCLUDE_DIR="../openssl-x86/include" \
+                -DCMAKE_OSX_ARCHITECTURES="$ARCH" \
                 -DBUILD_TESTING=OFF
     else
         cmake . \
@@ -186,14 +188,11 @@ if [ -n "$LIBGIT2_VERSION" ]; then
     mkdir -p build
     cd build
     if [ "$KERNEL" = "Darwin" ] && [ "$CIBUILDWHEEL" = "1" ]; then
-        CMAKE_PREFIX_PATH=$OPENSSL_PREFIX:$PREFIX cmake .. \
+        CMAKE_PREFIX_PATH=$PREFIX cmake .. \
                 -DBUILD_SHARED_LIBS=ON \
                 -DBUILD_TESTS=OFF \
                 -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-                -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
-                -DOPENSSL_CRYPTO_LIBRARY="../openssl-universal/$LIBCRYPTO" \
-                -DOPENSSL_SSL_LIBRARY="../openssl-universal/$LIBSSL" \
-                -DOPENSSL_INCLUDE_DIR="../openssl-x86/include" \
+                -DCMAKE_OSX_ARCHITECTURES="$ARCH" \
                 -DCMAKE_INSTALL_PREFIX=$PREFIX \
                 -DUSE_SSH=$USE_SSH
     else
@@ -212,9 +211,13 @@ if [ -n "$LIBGIT2_VERSION" ]; then
 fi
 
 if [ "$CIBUILDWHEEL" = "1" ]; then
+    # Record versions so the cache can be reused.
+    cat > $PREFIX/versions.txt <<EOF
+LIBGIT2_VERSION=$LIBGIT2_VERSION
+LIBSSH2_VERSION=$LIBSSH2_VERSION
+OPENSSL_VERSION=$OPENSSL_VERSION
+EOF
     if [ "$KERNEL" = "Darwin" ]; then
-        cp $OPENSSL_PREFIX/*.dylib $PREFIX/lib/
-        cp $OPENSSL_PREFIX/*.dylib $PREFIX/lib/
         echo "PREFIX        " $PREFIX
         echo "OPENSSL_PREFIX" $OPENSSL_PREFIX
         ls -l $PREFIX