From 563ea8089cc2b4566efb6a599bfbc57d166054c3 Mon Sep 17 00:00:00 2001 From: Alexis Jeandet Date: Mon, 7 Oct 2024 22:35:09 +0200 Subject: [PATCH 1/3] Update wraps and python 3.13 is released now Signed-off-by: Alexis Jeandet --- .github/workflows/CI.yml | 5 ++--- subprojects/catch2.wrap | 12 ++++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index fad79fe..634a54c 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -52,7 +52,7 @@ jobs: arch: amd64 - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v2.19.1 + uses: pypa/cibuildwheel@v2.21.2 - uses: actions/upload-artifact@v4 with: name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }} @@ -89,7 +89,6 @@ jobs: pip install --no-index --find-links $env:GITHUB_WORKSPACE\dist pycdfpp - uses: actions/checkout@v4 - name: run tests - if: ${{ runner.os != 'Windows' && matrix.python-version != '3.13' }} run: | pip install ddt requests python -v tests/full_corpus/test_full_corpus.py @@ -98,7 +97,7 @@ jobs: needs: [build_wheels] strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13-dev'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] runs-on: macos-14 steps: - name: add pyenv to path diff --git a/subprojects/catch2.wrap b/subprojects/catch2.wrap index 489db6c..f9bf436 100644 --- a/subprojects/catch2.wrap +++ b/subprojects/catch2.wrap @@ -1,10 +1,10 @@ [wrap-file] -directory = Catch2-3.7.0 -source_url = https://github.com/catchorg/Catch2/archive/v3.7.0.tar.gz -source_filename = Catch2-3.7.0.tar.gz -source_hash = 5b10cd536fa3818112a82820ce0787bd9f2a906c618429e7c4dea639983c8e88 -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/catch2_3.7.0-1/Catch2-3.7.0.tar.gz -wrapdb_version = 3.7.0-1 +directory = Catch2-3.7.1 +source_url = https://github.com/catchorg/Catch2/archive/v3.7.1.tar.gz +source_filename = Catch2-3.7.1.tar.gz +source_hash = c991b247a1a0d7bb9c39aa35faf0fe9e19764213f28ffba3109388e62ee0269c +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/catch2_3.7.1-1/Catch2-3.7.1.tar.gz +wrapdb_version = 3.7.1-1 [provide] catch2 = catch2_dep From 91c8081665f3d0f73ff9b5abaa52a626b9baea14 Mon Sep 17 00:00:00 2001 From: Alexis Jeandet Date: Fri, 18 Oct 2024 12:10:56 +0200 Subject: [PATCH 2/3] Bump cibuildwheel Signed-off-by: Alexis Jeandet --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 634a54c..90b0855 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -52,7 +52,7 @@ jobs: arch: amd64 - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v2.21.2 + uses: pypa/cibuildwheel@v2.21.3 - uses: actions/upload-artifact@v4 with: name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }} From ab37269d5a249668fa4c65a8a84b7dbd40fe434c Mon Sep 17 00:00:00 2001 From: Alexis Jeandet Date: Fri, 18 Oct 2024 13:16:37 +0200 Subject: [PATCH 3/3] Try fix python 3.13 install issue on MacOs Signed-off-by: Alexis Jeandet --- .github/workflows/CI.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 90b0855..1dd84a6 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -97,7 +97,7 @@ jobs: needs: [build_wheels] strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13.0'] runs-on: macos-14 steps: - name: add pyenv to path @@ -106,6 +106,7 @@ jobs: - name: install dependencies run: | brew install pyenv + brew upgrade pyenv pyenv install ${{ matrix.python-version }} - uses: actions/download-artifact@v4 with: