From 2b579493dacdb8a95b49248e6a36a2641bd9f083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= Date: Tue, 5 Nov 2024 10:24:30 +0100 Subject: [PATCH] Update libgit2, libssh2, openssl --- .github/workflows/tests.yml | 10 +++++----- Makefile | 2 +- build.sh | 8 ++++---- pyproject.toml | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e156f4e2..9a8eaa78 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ jobs: - os: ubuntu-24.04 python-version: '3.10' - os: ubuntu-24.04 - python-version: '3.13-dev' + python-version: '3.13' - os: ubuntu-24.04 python-version: 'pypy3.10' - os: macos-latest @@ -34,13 +34,13 @@ jobs: if: runner.os == 'Linux' run: | sudo apt install tinyproxy - LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.1 /bin/sh build.sh test + LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.8.4 /bin/sh build.sh test - name: macOS if: runner.os == 'macOS' run: | export OPENSSL_PREFIX=`brew --prefix openssl@1.1` - LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.1 /bin/sh build.sh test + LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.8.4 /bin/sh build.sh test aarch64: runs-on: ubuntu-24.04 @@ -57,7 +57,7 @@ jobs: apt-get update -q -y apt-get install -q -y cmake libssl-dev python3-dev python3-venv wget run: | - LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.1 /bin/sh build.sh test + LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.8.4 /bin/sh build.sh test s390x: runs-on: ubuntu-24.04 @@ -75,5 +75,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.0 LIBGIT2_VERSION=1.8.1 /bin/sh build.sh test + 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 diff --git a/Makefile b/Makefile index 3b0823cd..b8a4cfc1 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: build html build: - OPENSSL_VERSION=3.1.5 LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.1 sh build.sh + OPENSSL_VERSION=3.2.3 LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.8.4 sh build.sh html: build make -C docs html diff --git a/build.sh b/build.sh index 5faae425..944ed052 100644 --- a/build.sh +++ b/build.sh @@ -22,14 +22,14 @@ # # sh build.sh # -# Build libgit2 1.8.1 (will use libssh2 if available), then build pygit2 +# Build libgit2 1.8.4 (will use libssh2 if available), then build pygit2 # inplace: # -# LIBGIT2_VERSION=1.8.1 sh build.sh +# LIBGIT2_VERSION=1.8.4 sh build.sh # -# Build libssh2 1.11.0 and libgit2 1.8.1, then build pygit2 inplace: +# Build libssh2 1.11.1 and libgit2 1.8.4, then build pygit2 inplace: # -# LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.1 sh build.sh +# LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.8.4 sh build.sh # # Build inplace and run the tests: # diff --git a/pyproject.toml b/pyproject.toml index 72e8f629..20d4b61a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ skip = "pp3* *musllinux_aarch64 *musllinux_ppc64le" archs = ["auto"] build-frontend = "default" dependency-versions = "pinned" -environment = {LIBGIT2_VERSION="1.8.1", LIBSSH2_VERSION="1.11.0", OPENSSL_VERSION="3.1.5", LIBGIT2="/project/ci"} +environment = {LIBGIT2_VERSION="1.8.4", LIBSSH2_VERSION="1.11.1", OPENSSL_VERSION="3.2.3", LIBGIT2="/project/ci"} before-all = "sh build.sh" @@ -21,7 +21,7 @@ repair-wheel-command = "LD_LIBRARY_PATH=/project/ci/lib auditwheel repair -w {de [tool.cibuildwheel.macos] archs = ["universal2"] -environment = {LIBGIT2_VERSION="1.8.1", LIBSSH2_VERSION="1.11.0", OPENSSL_VERSION="3.1.5", LIBGIT2="/Users/runner/work/pygit2/pygit2/ci"} +environment = {LIBGIT2_VERSION="1.8.4", LIBSSH2_VERSION="1.11.1", OPENSSL_VERSION="3.2.3", LIBGIT2="/Users/runner/work/pygit2/pygit2/ci"} repair-wheel-command = "DYLD_LIBRARY_PATH=/Users/runner/work/pygit2/pygit2/ci/lib delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}" [tool.ruff]