From cf3805f65659c5a828f6a682c24342a75e4e7641 Mon Sep 17 00:00:00 2001 From: tboy1337 <30571311+tboy1337@users.noreply.github.com> Date: Tue, 5 Nov 2024 13:40:22 +0000 Subject: [PATCH 1/9] Update wheels.yml --- .github/workflows/wheels.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 379c79a..79c4ef8 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -8,13 +8,18 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, windows-latest, macos-13, macos-latest] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + + - uses: actions/setup-python@v5 + + - name: Install cibuildwheel + run: python -m pip install cibuildwheel==2.21.3 - name: Build wheels - uses: pypa/cibuildwheel@v2.11.2 + run: python -m cibuildwheel --output-dir wheelhouse env: CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" CIBW_TEST_REQUIRES: tox @@ -22,7 +27,7 @@ jobs: CIBW_TEST_SKIP: "*-win*" CIBW_BUILD_VERBOSITY: 1 - - name: Store wheels - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: + name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }} path: ./wheelhouse/*.whl From c03a952c125e0a40232bb1811e0f7218ab0a6a21 Mon Sep 17 00:00:00 2001 From: tboy1337 <30571311+tboy1337@users.noreply.github.com> Date: Tue, 5 Nov 2024 20:01:57 +0000 Subject: [PATCH 2/9] Update wheels.yml --- .github/workflows/wheels.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 79c4ef8..1cd0471 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -4,16 +4,20 @@ on: [push] jobs: build_wheels: - name: Build wheels on ${{ matrix.os }} + name: Build wheels runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-13, macos-latest] + os: [ubuntu-latest, windows-latest, macos-12, macos-13, macos-14] + python-version: ['3.9', '3.10', '3.11', '3.12', '3.13'] steps: - uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} - name: Install cibuildwheel run: python -m pip install cibuildwheel==2.21.3 From 08f81559eabe56c925ebbcef91daaba65fa9a69d Mon Sep 17 00:00:00 2001 From: tboy1337 <30571311+tboy1337@users.noreply.github.com> Date: Tue, 5 Nov 2024 20:08:24 +0000 Subject: [PATCH 3/9] Update wheels.yml --- .github/workflows/wheels.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 1cd0471..a02d5d3 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -1,6 +1,8 @@ name: Build wheels -on: [push] +on: + release: + types: [push] jobs: build_wheels: From bd0fff19aa1a4fbdefa0e107969bde2d6959d404 Mon Sep 17 00:00:00 2001 From: tboy1337 <30571311+tboy1337@users.noreply.github.com> Date: Tue, 5 Nov 2024 20:13:54 +0000 Subject: [PATCH 4/9] Update wheels.yml --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index a02d5d3..4165a9a 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -35,5 +35,5 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }} + name: cibw-wheels-${{ matrix.os }}-${{ matrix.python-version }}-${{ strategy.job-index }} path: ./wheelhouse/*.whl From 9674b537014295ccfdc14eac5e09bac34b7d1889 Mon Sep 17 00:00:00 2001 From: tboy1337 <30571311+tboy1337@users.noreply.github.com> Date: Tue, 5 Nov 2024 20:15:49 +0000 Subject: [PATCH 5/9] Update wheels.yml --- .github/workflows/wheels.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 4165a9a..1f20c1a 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -22,7 +22,8 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install cibuildwheel - run: python -m pip install cibuildwheel==2.21.3 + run: | + python -m pip install cibuildwheel==2.21.3 - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse From 920656312808b214c7fc1e8ce0e46c5405a58424 Mon Sep 17 00:00:00 2001 From: tboy1337 <30571311+tboy1337@users.noreply.github.com> Date: Tue, 5 Nov 2024 20:17:10 +0000 Subject: [PATCH 6/9] Update wheels.yml --- .github/workflows/wheels.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 1f20c1a..c961163 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -26,7 +26,8 @@ jobs: python -m pip install cibuildwheel==2.21.3 - name: Build wheels - run: python -m cibuildwheel --output-dir wheelhouse + run: | + python -m cibuildwheel --output-dir wheelhouse env: CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" CIBW_TEST_REQUIRES: tox From 08a467d5593d8ca80a75bb92f53e2cdc0c9be84c Mon Sep 17 00:00:00 2001 From: tboy1337 <30571311+tboy1337@users.noreply.github.com> Date: Tue, 5 Nov 2024 20:23:37 +0000 Subject: [PATCH 7/9] Update wheels.yml --- .github/workflows/wheels.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index c961163..baf6820 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -5,6 +5,7 @@ on: types: [push] jobs: + build_wheels: name: Build wheels runs-on: ${{ matrix.os }} @@ -23,11 +24,10 @@ jobs: - name: Install cibuildwheel run: | - python -m pip install cibuildwheel==2.21.3 + python -m pip install --upgrade pip setuptools wheel - name: Build wheels - run: | - python -m cibuildwheel --output-dir wheelhouse + uses: pypa/cibuildwheel@v2.21.3 env: CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" CIBW_TEST_REQUIRES: tox From f319d392f25c9b1b8e446cb8e08d78644bd19501 Mon Sep 17 00:00:00 2001 From: tboy1337 <30571311+tboy1337@users.noreply.github.com> Date: Tue, 5 Nov 2024 20:26:22 +0000 Subject: [PATCH 8/9] Update wheels.yml --- .github/workflows/wheels.yml | 45 +++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index baf6820..9ce60e4 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -1,4 +1,4 @@ -name: Build wheels +name: Build and publish wheels on: release: @@ -11,23 +11,23 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-12, macos-13, macos-14] - python-version: ['3.9', '3.10', '3.11', '3.12', '3.13'] + os: [ubuntu-latest, windows-latest, macos-latest] + python-version: ['3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - - uses: actions/setup-python@v5 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - - name: Install cibuildwheel + - name: Install dependencies run: | python -m pip install --upgrade pip setuptools wheel - name: Build wheels - uses: pypa/cibuildwheel@v2.21.3 + uses: pypa/cibuildwheel@v2.17.0 env: CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" CIBW_TEST_REQUIRES: tox @@ -35,7 +35,36 @@ jobs: CIBW_TEST_SKIP: "*-win*" CIBW_BUILD_VERBOSITY: 1 - - uses: actions/upload-artifact@v4 + - name: Store wheels + uses: actions/upload-artifact@v4 with: - name: cibw-wheels-${{ matrix.os }}-${{ matrix.python-version }}-${{ strategy.job-index }} + name: dist-${{ matrix.os }}-${{ matrix.python-version }} path: ./wheelhouse/*.whl + + publish: + name: Publish wheels to PyPI + needs: build_wheels + runs-on: ubuntu-latest + + steps: + - name: Download artifacts + uses: actions/download-artifact@v4 + with: + pattern: dist-* + merge-multiple: true + path: dist + + - name: Setup python + uses: actions/setup-python@v5 + with: + python-version: '3.12' + + - name: Install Twine + run: | + pip install twine + + - name: Publish wheels to PyPI + run: twine upload dist/* + env: + TWINE_USERNAME: __token__ + TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }} From d70315e3ec8ce87742f5dc84f8b5be1510f79368 Mon Sep 17 00:00:00 2001 From: tboy1337 <30571311+tboy1337@users.noreply.github.com> Date: Tue, 5 Nov 2024 20:27:23 +0000 Subject: [PATCH 9/9] Update wheels.yml --- .github/workflows/wheels.yml | 57 +++++++----------------------------- 1 file changed, 10 insertions(+), 47 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 9ce60e4..79c4ef8 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -1,33 +1,25 @@ -name: Build and publish wheels +name: Build wheels -on: - release: - types: [push] +on: [push] jobs: - build_wheels: - name: Build wheels + name: Build wheels on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ['3.9', '3.10', '3.11', '3.12'] + os: [ubuntu-latest, windows-latest, macos-13, macos-latest] steps: - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} + - uses: actions/setup-python@v5 - - name: Install dependencies - run: | - python -m pip install --upgrade pip setuptools wheel + - name: Install cibuildwheel + run: python -m pip install cibuildwheel==2.21.3 - name: Build wheels - uses: pypa/cibuildwheel@v2.17.0 + run: python -m cibuildwheel --output-dir wheelhouse env: CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" CIBW_TEST_REQUIRES: tox @@ -35,36 +27,7 @@ jobs: CIBW_TEST_SKIP: "*-win*" CIBW_BUILD_VERBOSITY: 1 - - name: Store wheels - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v4 with: - name: dist-${{ matrix.os }}-${{ matrix.python-version }} + name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }} path: ./wheelhouse/*.whl - - publish: - name: Publish wheels to PyPI - needs: build_wheels - runs-on: ubuntu-latest - - steps: - - name: Download artifacts - uses: actions/download-artifact@v4 - with: - pattern: dist-* - merge-multiple: true - path: dist - - - name: Setup python - uses: actions/setup-python@v5 - with: - python-version: '3.12' - - - name: Install Twine - run: | - pip install twine - - - name: Publish wheels to PyPI - run: twine upload dist/* - env: - TWINE_USERNAME: __token__ - TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}