diff --git a/.github/workflows/cleanup_pypi.yml b/.github/workflows/cleanup_pypi.yml index e290faae..7dea69ac 100644 --- a/.github/workflows/cleanup_pypi.yml +++ b/.github/workflows/cleanup_pypi.yml @@ -52,7 +52,7 @@ jobs: - name: Install Astral UV uses: astral-sh/setup-uv@v6 with: - version: "0.8.16" + version: "0.8.22" - name: Run Cleanup env: diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index ab696897..87272846 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -70,7 +70,7 @@ jobs: - name: Install Astral UV and enable the cache uses: astral-sh/setup-uv@v6 with: - version: "0.8.16" + version: "0.8.22" python-version: 3.9 enable-cache: true cache-suffix: -${{ github.workflow }} diff --git a/.github/workflows/packaging_sdist.yml b/.github/workflows/packaging_sdist.yml index 87923f4c..a74d1137 100644 --- a/.github/workflows/packaging_sdist.yml +++ b/.github/workflows/packaging_sdist.yml @@ -58,7 +58,7 @@ jobs: - name: Install Astral UV uses: astral-sh/setup-uv@v6 with: - version: "0.8.16" + version: "0.8.22" python-version: 3.11 - name: Build sdist diff --git a/.github/workflows/packaging_wheels.yml b/.github/workflows/packaging_wheels.yml index ea13b674..9d00148c 100644 --- a/.github/workflows/packaging_wheels.yml +++ b/.github/workflows/packaging_wheels.yml @@ -45,9 +45,6 @@ jobs: - { minimal: true, python: cp311 } - { minimal: true, python: cp312 } - { minimal: true, platform: { arch: universal2 } } - # Windows+cp314t disabled due to test failures in CI. - # TODO: Diagnose why tests fail (access violations) in some configurations - - { python: cp314t, platform: { os: windows-2025 } } runs-on: ${{ matrix.platform.os }} env: @@ -84,13 +81,13 @@ jobs: # Install Astral UV, which will be used as build-frontend for cibuildwheel - uses: astral-sh/setup-uv@v6 with: - version: "0.8.16" + version: "0.8.22" enable-cache: false cache-suffix: -${{ matrix.python }}-${{ matrix.platform.cibw_system }}_${{ matrix.platform.arch }} python-version: ${{ matrix.python }} - name: Build${{ inputs.testsuite != 'none' && ' and test ' || ' ' }}wheels - uses: pypa/cibuildwheel@v3.1 + uses: pypa/cibuildwheel@v3.2 env: CIBW_ARCHS: ${{ matrix.platform.arch == 'amd64' && 'AMD64' || matrix.platform.arch }} CIBW_BUILD: ${{ matrix.python }}-${{ matrix.platform.cibw_system }}_${{ matrix.platform.arch }} diff --git a/pyproject.toml b/pyproject.toml index bcbb24f6..c295bada 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -123,6 +123,15 @@ if.env.COVERAGE = false inherit.cmake.define = "append" cmake.define.DISABLE_UNITY = "1" +[[tool.scikit-build.overrides]] +if.platform-system = "^win32" +if.abi-flags = "t" +inherit.cmake.define = "append" +# /DPy_GIL_DISABLED: needed else the build will try to link python314.lib +# CMAKE_..._FLAGS_INIT not FLAGS: otherwise, msbuild will disable important defaults such as /EHsc +cmake.define.CMAKE_C_FLAGS_INIT="/DPy_MOD_GIL_USED /DPy_GIL_DISABLED" +cmake.define.CMAKE_CXX_FLAGS_INIT="/DPy_MOD_GIL_USED /DPy_GIL_DISABLED" + [tool.scikit-build.sdist] include = [ "README.md",