From 754fb0d234bd0c1af9fc6eefa766626e1c5d64ce Mon Sep 17 00:00:00 2001 From: Sebastien Roy Date: Wed, 9 Oct 2024 14:54:12 -0400 Subject: [PATCH 1/3] add support for mac and more linux builds but temporarily disable actual release for testing --- .github/workflows/release.yml | 32 ++++++++++++++++++++------------ pyproject.toml | 10 ++++++++-- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7c6df98..845a1f2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,9 +1,10 @@ # the name of this file must match the one in pypi.org config name: Build/Test/Release -on: - release: - types: - - published +on: [push] + # on: + # release: + # types: + # - published permissions: id-token: write # This is required for requesting the JWT jobs: @@ -28,23 +29,30 @@ jobs: env: BUILD_OS: ${{ matrix.os }} CXX: ${{ matrix.compiler }} - - name: Publish source dist release distributions to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 +# - name: Publish source dist release distributions to PyPI +# uses: pypa/gh-action-pypi-publish@release/v1 wheels_build: name: Build wheels on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: - # macos-13 is an intel runner, macos-14 is apple silicon - # os: [ubuntu-latest, macos-13, macos-14] os: [ubuntu-latest] + max: [none] + include: + - os: macos-13 + max: 13.0 + - os: macos-14 + max: 14.0 steps: - uses: actions/checkout@v4 - name: Build wheels uses: pypa/cibuildwheel@v2.21.2 with: config-file: "{package}/pyproject.toml" - - name: Publish wheel release distributions to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - packages-dir: wheelhouse + env: + MACOSX_DEPLOYMENT_TARGET: ${{ matrix.max }} +# - name: Publish wheel release distributions to PyPI +# uses: pypa/gh-action-pypi-publish@release/v1 +# with: +# packages-dir: wheelhouse diff --git a/pyproject.toml b/pyproject.toml index ae8ba40..63f9f59 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -191,7 +191,13 @@ sdist.include = ["fast_pauli/__version__.py"] write_to = "fast_pauli/__version__.py" [tool.cibuildwheel] -build = ["cp310-manylinux_x86_64", "cp311-manylinux_x86_64", "cp312-manylinux_x86_64", "cp313-manylinux_x86_64"] -build-frontend = "build" +skip = "pp*" test-requires = "pytest" test-command = "pytest -s -vv --import-mode importlib {project}/tests/fast_pauli" + +[tool.cibuildwheel.linux] +build = ["cp3*_x86_64"] +skip = ["*musllinux*"] + +[tool.cibuildwheel.macos] +environment = "CXX=g++-14" From dd3169f1228adbac0e7d5adf91a9db0af7991491 Mon Sep 17 00:00:00 2001 From: Sebastien Roy Date: Wed, 9 Oct 2024 15:13:41 -0400 Subject: [PATCH 2/3] remove test hack --- .github/workflows/release.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 845a1f2..fe308a8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,10 +1,9 @@ # the name of this file must match the one in pypi.org config name: Build/Test/Release -on: [push] - # on: - # release: - # types: - # - published +on: + release: + types: + - published permissions: id-token: write # This is required for requesting the JWT jobs: @@ -29,8 +28,8 @@ jobs: env: BUILD_OS: ${{ matrix.os }} CXX: ${{ matrix.compiler }} -# - name: Publish source dist release distributions to PyPI -# uses: pypa/gh-action-pypi-publish@release/v1 + # - name: Publish source dist release distributions to PyPI + # uses: pypa/gh-action-pypi-publish@release/v1 wheels_build: name: Build wheels on ${{ matrix.os }} runs-on: ${{ matrix.os }} @@ -52,7 +51,7 @@ jobs: config-file: "{package}/pyproject.toml" env: MACOSX_DEPLOYMENT_TARGET: ${{ matrix.max }} -# - name: Publish wheel release distributions to PyPI -# uses: pypa/gh-action-pypi-publish@release/v1 -# with: -# packages-dir: wheelhouse + - name: Publish wheel release distributions to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 + with: + packages-dir: wheelhouse From 712bb97cd24cc20542574f6577796b1b5b695308 Mon Sep 17 00:00:00 2001 From: Sebastien Roy Date: Wed, 9 Oct 2024 15:52:27 -0400 Subject: [PATCH 3/3] indent errors fix --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fe308a8..63a6c61 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,8 +2,8 @@ name: Build/Test/Release on: release: - types: - - published + types: + - published permissions: id-token: write # This is required for requesting the JWT jobs: @@ -28,8 +28,8 @@ jobs: env: BUILD_OS: ${{ matrix.os }} CXX: ${{ matrix.compiler }} - # - name: Publish source dist release distributions to PyPI - # uses: pypa/gh-action-pypi-publish@release/v1 + - name: Publish source dist release distributions to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 wheels_build: name: Build wheels on ${{ matrix.os }} runs-on: ${{ matrix.os }}