From 8f52f6e3cae15a13d7acce07dc3d8e91ed3a274c Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 8 Jan 2025 18:37:12 +0100 Subject: [PATCH 1/4] release: updates --- .github/workflows/release-linux.yml | 38 +++++++++------------------ .github/workflows/release-osx-win.yml | 8 +++--- 2 files changed, 17 insertions(+), 29 deletions(-) diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml index 84bcc72b3..8f8a252f7 100644 --- a/.github/workflows/release-linux.yml +++ b/.github/workflows/release-linux.yml @@ -10,37 +10,25 @@ on: jobs: build-wheel: - name: "Build ${{ matrix.build }} wheels on ${{ matrix.os }} ${{ matrix.arch }}" - runs-on: "${{ matrix.os }}-latest" + name: "Build ${{ matrix.build }} wheels on ${{ matrix.arch }}" + runs-on: "ubuntu-latest" strategy: matrix: - os: ["ubuntu"] - arch: ["x86_64"] - build: ["cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*", "pp38-*", "pp39-*"] - include: + arch: ["x86_64", "aarch64"] + build: ["cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*", "pp38-*", "pp39-*"] + exclude: - arch: "aarch64" - os: "ubuntu" - build: "cp38-manylinux*" + build: "pp38-*" - arch: "aarch64" - os: "ubuntu" - build: "cp39-manylinux*" - - arch: "aarch64" - os: "ubuntu" - build: "cp310-manylinux*" - - arch: "aarch64" - os: "ubuntu" - build: "cp311-manylinux*" - - arch: "aarch64" - os: "ubuntu" - build: "cp312-manylinux*" + build: "pp39-*" steps: - uses: actions/checkout@v4 with: submodules: recursive - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.12" - name: Set up QEMU if: matrix.arch == 'aarch64' uses: docker/setup-qemu-action@v2 @@ -58,7 +46,7 @@ jobs: CIBW_MANYLINUX_PYPY_X86_64_IMAGE: "quay.io/pypa/manylinux2014_x86_64" CIBW_MANYLINUX_AARCH64_IMAGE: "quay.io/pypa/manylinux_2_28_aarch64" CIBW_REPAIR_WHEEL_COMMAND: "" - CIBW_ENVIRONMENT: "CMEEL_JOBS=2 CMEEL_RUN_TESTS=OFF" + CIBW_ENVIRONMENT: "CMEEL_JOBS=2 CMEEL_RUN_TESTS=OFF CMEEL_CMAKE_ARGS=-DBUILD_WITH_OPENMP_SUPPORT=ON" - uses: actions/upload-artifact@v3 with: @@ -69,10 +57,10 @@ jobs: needs: "build-wheel" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.12" - uses: actions/download-artifact@v3 - name: Publish package to PyPI diff --git a/.github/workflows/release-osx-win.yml b/.github/workflows/release-osx-win.yml index d19755881..c6c0204b1 100644 --- a/.github/workflows/release-osx-win.yml +++ b/.github/workflows/release-osx-win.yml @@ -14,7 +14,7 @@ jobs: name: Build ${{ matrix.os }} ${{ matrix.python-version }} strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] os: [macos-13, macos-14, windows-2019, windows-latest] include: - os: windows-2019 @@ -89,10 +89,10 @@ jobs: needs: "build-wheel" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.12" - uses: actions/download-artifact@v3 - name: Publish package to PyPI From 26469b42522d47e151226de601c56dc6e9f2718f Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 8 Jan 2025 18:42:39 +0100 Subject: [PATCH 2/4] add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9281c4299..3fec46c03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Added * Stub files for Python bindings, using [nanobind's native support](https://nanobind.readthedocs.io/en/latest/typing.html#stub-generation) ([#340](https://github.com/Simple-Robotics/proxsuite/pull/340)) +* Python 3.13 support on PyPI ([#361](https://github.com/Simple-Robotics/proxsuite/pull/361)) * Add `solve_no_gil` for dense backend (multithreading via python) ([#363](https://github.com/Simple-Robotics/proxsuite/pull/363)) * Add benchmarks for `solve_no_gil` vs `solve_in_parallel` (openmp) ([#363](https://github.com/Simple-Robotics/proxsuite/pull/363)) From 055882da9c4fd5e40d875a0c667d70f3aebfece0 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 20 Jan 2025 11:38:08 +0100 Subject: [PATCH 3/4] release: remove use of PYPI_TOKEN --- .github/workflows/release-linux.yml | 3 --- .github/workflows/release-osx-win.yml | 3 --- 2 files changed, 6 deletions(-) diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml index 8f8a252f7..c626dc3ee 100644 --- a/.github/workflows/release-linux.yml +++ b/.github/workflows/release-linux.yml @@ -68,9 +68,6 @@ jobs: if: | github.repository == 'Simple-Robotics/proxsuite' && (github.event_name == 'release' && github.event.action == 'published') - with: - user: __token__ - password: ${{ secrets.PYPI_TOKEN }} check: if: always() diff --git a/.github/workflows/release-osx-win.yml b/.github/workflows/release-osx-win.yml index c6c0204b1..febc4b136 100644 --- a/.github/workflows/release-osx-win.yml +++ b/.github/workflows/release-osx-win.yml @@ -100,9 +100,6 @@ jobs: if: | github.repository == 'Simple-Robotics/proxsuite' && (github.event_name == 'release' && github.event.action == 'published') - with: - user: __token__ - password: ${{ secrets.PYPI_TOKEN }} check: if: always() From 8496fedb5ad2dcc149b094ad9b899035f0a7e63a Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 20 Jan 2025 11:42:20 +0100 Subject: [PATCH 4/4] release: add pp310 --- .github/workflows/release-linux.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml index c626dc3ee..3e03535c8 100644 --- a/.github/workflows/release-linux.yml +++ b/.github/workflows/release-linux.yml @@ -15,12 +15,14 @@ jobs: strategy: matrix: arch: ["x86_64", "aarch64"] - build: ["cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*", "pp38-*", "pp39-*"] + build: ["cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*", "pp38-*", "pp39-*", "pp310-*"] exclude: - arch: "aarch64" build: "pp38-*" - arch: "aarch64" build: "pp39-*" + - arch: "aarch64" + build: "pp310-*" steps: - uses: actions/checkout@v4