From c4b800c750dfd9d73699720c793ab3ca0252282f Mon Sep 17 00:00:00 2001 From: scaramallion Date: Sun, 2 Jan 2022 12:11:06 +1100 Subject: [PATCH 01/11] Test wheels --- .github/workflows/release-wheels.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-wheels.yml b/.github/workflows/release-wheels.yml index 6d448db..2fde9fb 100644 --- a/.github/workflows/release-wheels.yml +++ b/.github/workflows/release-wheels.yml @@ -3,6 +3,8 @@ name: Build wheels and deploy to PyPI on: release: types: [ published ] + pull-request: + branches: [ master ] jobs: build_wheels: @@ -48,7 +50,7 @@ jobs: python -m cibuildwheel --output-dir dist env: CIBW_BEFORE_ALL: | - curl -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable -y && rustup target add i686-pc-windows-msvc + curl -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable -y && rustup target add i686-pc-windows-msvc i686-unknown-linux-musl CIBW_ENVIRONMENT: 'PATH="$PATH:$HOME/.cargo/bin"' - uses: actions/upload-artifact@v2 From a95b51114cdbbabe53bd8488bcba891b65209c95 Mon Sep 17 00:00:00 2001 From: scaramallion Date: Sun, 2 Jan 2022 12:11:40 +1100 Subject: [PATCH 02/11] Test wheels 2 --- .github/workflows/release-wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-wheels.yml b/.github/workflows/release-wheels.yml index 2fde9fb..e645aea 100644 --- a/.github/workflows/release-wheels.yml +++ b/.github/workflows/release-wheels.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest] #, windows-latest, macos-latest] python-version: ["3.10"] steps: From 7e3bab745d73a40b27c572ccaa10386956436207 Mon Sep 17 00:00:00 2001 From: scaramallion Date: Sun, 2 Jan 2022 12:12:40 +1100 Subject: [PATCH 03/11] Test wheels 3 --- .github/workflows/release-wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-wheels.yml b/.github/workflows/release-wheels.yml index e645aea..30cb935 100644 --- a/.github/workflows/release-wheels.yml +++ b/.github/workflows/release-wheels.yml @@ -3,7 +3,7 @@ name: Build wheels and deploy to PyPI on: release: types: [ published ] - pull-request: + pull_request: branches: [ master ] jobs: From 7bf4bb035d7c41f173919dc20dbfebb84121d397 Mon Sep 17 00:00:00 2001 From: scaramallion Date: Sun, 2 Jan 2022 12:13:17 +1100 Subject: [PATCH 04/11] Test wheels 4 --- .github/workflows/release-wheels.yml | 50 ++++++++++++++-------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/release-wheels.yml b/.github/workflows/release-wheels.yml index 30cb935..ef63012 100644 --- a/.github/workflows/release-wheels.yml +++ b/.github/workflows/release-wheels.yml @@ -61,28 +61,28 @@ jobs: # The pypi upload fails with non-linux containers, so grab the uploaded # artifacts and run using those # See: https://github.com/pypa/gh-action-pypi-publish/discussions/15 - deploy: - name: Upload wheels to PyPI - needs: - - build_wheels - runs-on: ubuntu-latest - - steps: - - name: Download the wheels - uses: actions/download-artifact@v2 - with: - name: wheels - path: dist/ - - #- name: Publish package to Test PyPi - # uses: pypa/gh-action-pypi-publish@master - # with: - # user: __token__ - # password: ${{ secrets.TEST_PYPI_PASSWORD }} - # repository_url: https://test.pypi.org/legacy/ - - - name: Publish package to PyPi - uses: pypa/gh-action-pypi-publish@master - with: - user: __token__ - password: ${{ secrets.PYPI_PASSWORD }} + # deploy: + # name: Upload wheels to PyPI + # needs: + # - build_wheels + # runs-on: ubuntu-latest + # + # steps: + # - name: Download the wheels + # uses: actions/download-artifact@v2 + # with: + # name: wheels + # path: dist/ + # + # #- name: Publish package to Test PyPi + # # uses: pypa/gh-action-pypi-publish@master + # # with: + # # user: __token__ + # # password: ${{ secrets.TEST_PYPI_PASSWORD }} + # # repository_url: https://test.pypi.org/legacy/ + # + # - name: Publish package to PyPi + # uses: pypa/gh-action-pypi-publish@master + # with: + # user: __token__ + # password: ${{ secrets.PYPI_PASSWORD }} From 7b45bbb2aa7be186c0e395041b3c6e2c1c402488 Mon Sep 17 00:00:00 2001 From: scaramallion Date: Sun, 2 Jan 2022 12:30:24 +1100 Subject: [PATCH 05/11] Test wheels 5 --- .github/workflows/release-wheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-wheels.yml b/.github/workflows/release-wheels.yml index ef63012..ffa24fe 100644 --- a/.github/workflows/release-wheels.yml +++ b/.github/workflows/release-wheels.yml @@ -11,7 +11,7 @@ jobs: name: Build wheels for ${{ matrix.os }} runs-on: ${{ matrix.os }} env: - CIBW_SKIP: "cp36-*" + CIBW_SKIP: "cp36-*,cp37-*,cp39-*,cp310-*" strategy: fail-fast: false matrix: @@ -50,7 +50,7 @@ jobs: python -m cibuildwheel --output-dir dist env: CIBW_BEFORE_ALL: | - curl -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable -y && rustup target add i686-pc-windows-msvc i686-unknown-linux-musl + curl -sSf https://sh.rustup.rs | sh -s --m --profile minimal --default-toolchain stable -y && rustup target add i686-pc-windows-msvc i686-unknown-linux-musl CIBW_ENVIRONMENT: 'PATH="$PATH:$HOME/.cargo/bin"' - uses: actions/upload-artifact@v2 From c4ce3b2c6e2296c20a4742897c52119243d59fad Mon Sep 17 00:00:00 2001 From: scaramallion Date: Sun, 2 Jan 2022 12:34:08 +1100 Subject: [PATCH 06/11] Test wheels 6 --- .github/workflows/release-wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-wheels.yml b/.github/workflows/release-wheels.yml index ffa24fe..c9c19dc 100644 --- a/.github/workflows/release-wheels.yml +++ b/.github/workflows/release-wheels.yml @@ -50,7 +50,7 @@ jobs: python -m cibuildwheel --output-dir dist env: CIBW_BEFORE_ALL: | - curl -sSf https://sh.rustup.rs | sh -s --m --profile minimal --default-toolchain stable -y && rustup target add i686-pc-windows-msvc i686-unknown-linux-musl + curl -sSf https://sh.rustup.rs | sh -s --m --default-toolchain stable -y && rustup target add i686-pc-windows-msvc && rustup target add i686-unknown-linux-musl CIBW_ENVIRONMENT: 'PATH="$PATH:$HOME/.cargo/bin"' - uses: actions/upload-artifact@v2 From a8d2e0f685b3917ce097aeb58014bdabd7a72595 Mon Sep 17 00:00:00 2001 From: scaramallion Date: Sun, 2 Jan 2022 12:35:45 +1100 Subject: [PATCH 07/11] Test wheels 7 --- .github/workflows/release-wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-wheels.yml b/.github/workflows/release-wheels.yml index c9c19dc..0d53fb7 100644 --- a/.github/workflows/release-wheels.yml +++ b/.github/workflows/release-wheels.yml @@ -50,7 +50,7 @@ jobs: python -m cibuildwheel --output-dir dist env: CIBW_BEFORE_ALL: | - curl -sSf https://sh.rustup.rs | sh -s --m --default-toolchain stable -y && rustup target add i686-pc-windows-msvc && rustup target add i686-unknown-linux-musl + curl -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable -y && rustup target add i686-pc-windows-msvc && rustup target add i686-unknown-linux-musl CIBW_ENVIRONMENT: 'PATH="$PATH:$HOME/.cargo/bin"' - uses: actions/upload-artifact@v2 From 2ba17d54c4f6c94c78354d2951cb0c51e6673cdc Mon Sep 17 00:00:00 2001 From: scaramallion Date: Sun, 2 Jan 2022 12:37:58 +1100 Subject: [PATCH 08/11] Test wheels 8 --- .github/workflows/release-wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-wheels.yml b/.github/workflows/release-wheels.yml index 0d53fb7..681649e 100644 --- a/.github/workflows/release-wheels.yml +++ b/.github/workflows/release-wheels.yml @@ -11,7 +11,7 @@ jobs: name: Build wheels for ${{ matrix.os }} runs-on: ${{ matrix.os }} env: - CIBW_SKIP: "cp36-*,cp37-*,cp39-*,cp310-*" + CIBW_SKIP: "cp36-* cp37-* cp39-* cp310-*" strategy: fail-fast: false matrix: From e769c221f0f4d15e4c454b670d58ddacb8bc1156 Mon Sep 17 00:00:00 2001 From: scaramallion Date: Sun, 2 Jan 2022 12:49:30 +1100 Subject: [PATCH 09/11] Test wheels 9 --- .github/workflows/release-wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-wheels.yml b/.github/workflows/release-wheels.yml index 681649e..b2cd719 100644 --- a/.github/workflows/release-wheels.yml +++ b/.github/workflows/release-wheels.yml @@ -11,7 +11,7 @@ jobs: name: Build wheels for ${{ matrix.os }} runs-on: ${{ matrix.os }} env: - CIBW_SKIP: "cp36-* cp37-* cp39-* cp310-*" + CIBW_SKIP: "cp36-* cp37-* cp39-* cp310-* pp37* pp38* *-musl*" strategy: fail-fast: false matrix: From 2ca580b4dcac845f1c3e66a5f8b5332b07eef5dc Mon Sep 17 00:00:00 2001 From: scaramallion Date: Sun, 2 Jan 2022 12:54:48 +1100 Subject: [PATCH 10/11] Test wheels 10 --- .github/workflows/release-wheels.yml | 56 ++++++++++++++-------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/release-wheels.yml b/.github/workflows/release-wheels.yml index b2cd719..3470940 100644 --- a/.github/workflows/release-wheels.yml +++ b/.github/workflows/release-wheels.yml @@ -11,11 +11,11 @@ jobs: name: Build wheels for ${{ matrix.os }} runs-on: ${{ matrix.os }} env: - CIBW_SKIP: "cp36-* cp37-* cp39-* cp310-* pp37* pp38* *-musl*" + CIBW_SKIP: "cp36-* *-musl*" strategy: fail-fast: false matrix: - os: [ubuntu-latest] #, windows-latest, macos-latest] + os: [ubuntu-latest, windows-latest, macos-latest] python-version: ["3.10"] steps: @@ -50,7 +50,7 @@ jobs: python -m cibuildwheel --output-dir dist env: CIBW_BEFORE_ALL: | - curl -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable -y && rustup target add i686-pc-windows-msvc && rustup target add i686-unknown-linux-musl + curl -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable -y && rustup target add i686-pc-windows-msvc CIBW_ENVIRONMENT: 'PATH="$PATH:$HOME/.cargo/bin"' - uses: actions/upload-artifact@v2 @@ -61,28 +61,28 @@ jobs: # The pypi upload fails with non-linux containers, so grab the uploaded # artifacts and run using those # See: https://github.com/pypa/gh-action-pypi-publish/discussions/15 - # deploy: - # name: Upload wheels to PyPI - # needs: - # - build_wheels - # runs-on: ubuntu-latest - # - # steps: - # - name: Download the wheels - # uses: actions/download-artifact@v2 - # with: - # name: wheels - # path: dist/ - # - # #- name: Publish package to Test PyPi - # # uses: pypa/gh-action-pypi-publish@master - # # with: - # # user: __token__ - # # password: ${{ secrets.TEST_PYPI_PASSWORD }} - # # repository_url: https://test.pypi.org/legacy/ - # - # - name: Publish package to PyPi - # uses: pypa/gh-action-pypi-publish@master - # with: - # user: __token__ - # password: ${{ secrets.PYPI_PASSWORD }} + deploy: + name: Upload wheels to PyPI + needs: + - build_wheels + runs-on: ubuntu-latest + + steps: + - name: Download the wheels + uses: actions/download-artifact@v2 + with: + name: wheels + path: dist/ + + #- name: Publish package to Test PyPi + # uses: pypa/gh-action-pypi-publish@master + # with: + # user: __token__ + # password: ${{ secrets.TEST_PYPI_PASSWORD }} + # repository_url: https://test.pypi.org/legacy/ + + - name: Publish package to PyPi + uses: pypa/gh-action-pypi-publish@master + with: + user: __token__ + password: ${{ secrets.PYPI_PASSWORD }} From d21e3410633ba6de4bd9e0329864cb00c9b689ad Mon Sep 17 00:00:00 2001 From: scaramallion Date: Sun, 2 Jan 2022 13:21:22 +1100 Subject: [PATCH 11/11] Finalise --- .github/workflows/release-wheels.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release-wheels.yml b/.github/workflows/release-wheels.yml index 3470940..25a324f 100644 --- a/.github/workflows/release-wheels.yml +++ b/.github/workflows/release-wheels.yml @@ -3,8 +3,6 @@ name: Build wheels and deploy to PyPI on: release: types: [ published ] - pull_request: - branches: [ master ] jobs: build_wheels: