Merge branch 'master' into typecheck-part-1

Author: DinhHuy2010

.github/workflows/codespell.yml

@@ -0,0 +1,23 @@
+# Codespell configuration is within pyproject.toml
+---
+name: Codespell
+
+on:
+  pull_request:
+  push:
+
+permissions:
+  contents: read
+
+jobs:
+  codespell:
+    name: Check for spelling errors
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Annotate locations with typos
+        uses: codespell-project/codespell-problem-matcher@v1
+      - name: Codespell
+        uses: codespell-project/actions-codespell@v2

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ on:
     - '**.rst'
 
 jobs:
-  x86_64:
+  linux:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -18,8 +18,8 @@ jobs:
           python-version: '3.13'
         - os: ubuntu-24.04
           python-version: 'pypy3.10'
-        - os: macos-latest
-          python-version: '3.10'
+        - os: ubuntu-24.04-arm
+          python-version: '3.13'
 
     steps:
     - name: Checkout pygit2
@@ -31,49 +31,41 @@ 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.8.4 /bin/sh build.sh test
+        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.8.4 /bin/sh build.sh test
-
-  aarch64:
+  linux-s390x:
     runs-on: ubuntu-24.04
+    if: github.ref == 'refs/heads/master'
     steps:
     - name: Checkout
       uses: actions/checkout@v4
 
     - name: Build & test
       uses: uraimo/run-on-arch-action@v2
       with:
-        arch: aarch64
+        arch: s390x
         distro: ubuntu22.04
         install: |
           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.8.4 /bin/sh build.sh test
+          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
 
-  s390x:
-    runs-on: ubuntu-24.04
-    if: github.ref == 'refs/heads/master'
+  macos-arm64:
+    runs-on: macos-latest
     steps:
-    - name: Checkout
+    - name: Checkout pygit2
       uses: actions/checkout@v4
 
-    - name: Build & test
-      uses: uraimo/run-on-arch-action@v2
+    - name: Set up Python
+      uses: actions/setup-python@v5
       with:
-        arch: s390x
-        distro: ubuntu22.04
-        install: |
-          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.8.4 /bin/sh build.sh test
-      continue-on-error: true # Tests are expected to fail, see issue #812
+        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

.github/workflows/wheels.yml

@@ -4,47 +4,80 @@ on:
   push:
     branches:
     - master
+    - wheels-*
     tags:
     - 'v*'
 
 jobs:
   build_wheels:
-    name: Build wheels on ${{ matrix.os }}
+    name: Wheels for ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         include:
-        - name: linux
+        - name: linux-amd
           os: ubuntu-24.04
+        - name: linux-arm
+          os: ubuntu-24.04-arm
         - 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'
+
+      - name: Install cibuildwheel
+        run: python -m pip install cibuildwheel==2.22.0
+
+      - name: Build wheels
+        run: python -m cibuildwheel --output-dir wheelhouse
+        env:
+          CIBW_MANYLINUX_AARCH64_IMAGE: "manylinux_2_28"
+          CIBW_MANYLINUX_X86_64_IMAGE: "manylinux_2_28"
+          CIBW_MANYLINUX_PYPY_X86_64_IMAGE: "manylinux_2_28"
+          CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: "manylinux_2_28"
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: wheels-${{ matrix.name }}
+          path: ./wheelhouse/*.whl
+
+  build_wheels_ppc:
+    name: Wheels for linux-ppc
+    runs-on: ubuntu-24.04
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
 
       - uses: docker/setup-qemu-action@v3
-        if: runner.os == 'Linux'
         with:
-          platforms: all
+          platforms: linux/ppc64le
 
       - 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
+        env:
+          CIBW_ARCHS: ppc64le
+          CIBW_ENVIRONMENT: LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.0 LIBGIT2=/project/ci
+          CIBW_MANYLINUX_PPC64LE_IMAGE: "manylinux_2_28"
 
       - uses: actions/upload-artifact@v4
         with:
-          name: wheels-${{ matrix.name }}
+          name: wheels-linux-ppc
           path: ./wheelhouse/*.whl
 
   pypi:
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
-    needs: [build_wheels]
+    needs: [build_wheels, build_wheels_ppc]
     runs-on: ubuntu-24.04
 
     steps:

.mailmap

@@ -12,6 +12,7 @@ J. David Ibáñez <[email protected]> <[email protected]>
 Jeremy Westwood <[email protected]>
 Jose Plana <[email protected]> <[email protected]>
 Kaarel Kitsemets <[email protected]>
+Karl Malmros <[email protected]> <[email protected]>
 Lukas Fleischer <[email protected]> <[email protected]>
 Martin Lenders <[email protected]> <[email protected]>
 Matthew Duggan <[email protected]> <[email protected]>
@@ -32,6 +33,7 @@ Tamir Bahar <[email protected]> <[email protected]>
 Victor Garcia <[email protected]> <[email protected]>
 Victor Florea <[email protected]>
 Vlad Temian <[email protected]>
+William Schueller <[email protected]> <[email protected]>
 Wim Jeantine-Glenn <[email protected]>
 Xavier Delannoy <[email protected]>
 Xu Tao <[email protected]>

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

CHANGELOG.md

@@ -1,3 +1,58 @@
+# 1.17.1 (UNRELEASED)
+
+- Upgrade Linux Glibc wheels to `manylinux_2_28`
+
+- Add `RemoteCallbacks.push_transfer_progress(...)` callback
+  [#1345](https://github.com/libgit2/pygit2/pull/1345)
+
+- New `bool(oid)` and some doc/typing fixes
+  [#1347](https://github.com/libgit2/pygit2/pull/1347)
+
+- Now `Repository.merge(...)` accepts a commit or reference object
+  [#1348](https://github.com/libgit2/pygit2/pull/1348)
+
+- Fix when a reference name has non UTF-8 chars
+  [#1329](https://github.com/libgit2/pygit2/pull/1329)
+
+- Fix condition check in `Repository.remotes.rename(...)`
+  [#1342](https://github.com/libgit2/pygit2/pull/1342)
+
+- Add codespell workflow, fix a number of typos
+  [#1344](https://github.com/libgit2/pygit2/pull/1344)
+
+- More typing
+  [#1343](https://github.com/libgit2/pygit2/pull/1343)
+
+- CI: Use ARM runner for tests and wheels
+  [#1346](https://github.com/libgit2/pygit2/pull/1346)
+
+Deprecations:
+
+- Passing str to `Repository.merge(...)` is deprecated,
+  instead pass an oid object (or a commit, or a reference)
+
+
+# 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
@@ -238,7 +293,7 @@ Deprecations:
 -   New `keep_all` and `paths` optional arguments for
     `Repository.stash(...)`
     [#1202](https://github.com/libgit2/pygit2/pull/1202)
--   New `Respository.state()`
+-   New `Repository.state()`
     [#1204](https://github.com/libgit2/pygit2/pull/1204)
 -   Improve `Repository.write_archive(...)` performance
     [#1183](https://github.com/libgit2/pygit2/pull/1183)
@@ -418,7 +473,7 @@ Breaking changes:
 
 Breaking changes:
 
--   Remove deprecated `GIT_CREDTYPE_XXX` contants, use
+-   Remove deprecated `GIT_CREDTYPE_XXX` constants, use
     `GIT_CREDENTIAL_XXX` instead.
 -   Remove deprecated `Patch.patch` getter, use `Patch.text` instead.
 
@@ -515,7 +570,7 @@ Deprecations:
 
 -   Deprecate `Repository.create_remote(...)`, use instead
     `Repository.remotes.create(...)`
--   Deprecate `GIT_CREDTYPE_XXX` contants, use `GIT_CREDENTIAL_XXX`
+-   Deprecate `GIT_CREDTYPE_XXX` constants, use `GIT_CREDENTIAL_XXX`
     instead.
 
 # 1.2.0 (2020-04-05)
@@ -636,7 +691,7 @@ Breaking changes:
 
 Breaking changes:
 
--   Now the Repository has a new attribue `odb` for object database:
+-   Now the Repository has a new attribute `odb` for object database:
 
         # Before
         repository.read(...)
@@ -841,7 +896,7 @@ Other changes:
     [#610](https://github.com/libgit2/pygit2/issues/610)
 -   Fix tests failing in some cases
     [#795](https://github.com/libgit2/pygit2/issues/795)
--   Automatize wheels upload to pypi
+-   Automate wheels upload to pypi
     [#563](https://github.com/libgit2/pygit2/issues/563)
 
 # 0.27.0 (2018-03-30)

Makefile

@@ -1,7 +1,7 @@
 .PHONY: build html
 
 build:
-	OPENSSL_VERSION=3.2.3 LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.8.4 sh build.sh
+	OPENSSL_VERSION=3.2.3 LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.0 sh build.sh
 
 html: build
 	make -C docs html

appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.16.{build}
+version: 1.17.{build}
 image: Visual Studio 2019
 configuration: Release
 environment:
@@ -35,7 +35,7 @@ build_script:
 # Clone, build and install libgit2
 - cmd: |
     set LIBGIT2=%APPVEYOR_BUILD_FOLDER%\venv
-    git clone --depth=1 -b v1.8.1 https://github.com/libgit2/libgit2.git libgit2
+    git clone --depth=1 -b v1.9.0 https://github.com/libgit2/libgit2.git libgit2
     cd libgit2
     cmake . -DBUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="%LIBGIT2%" -G "%GENERATOR%"
     cmake --build . --target install