From 99b4f2dc61658266078292eb347dda0aae6f73a3 Mon Sep 17 00:00:00 2001 From: Olof Blomqvist Date: Tue, 1 Aug 2023 19:30:49 +0200 Subject: [PATCH 01/15] Create maturin-test.yml --- .github/workflows/maturin-test.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/maturin-test.yml diff --git a/.github/workflows/maturin-test.yml b/.github/workflows/maturin-test.yml new file mode 100644 index 0000000..8760309 --- /dev/null +++ b/.github/workflows/maturin-test.yml @@ -0,0 +1,19 @@ +# .github/workflows/maturin-test.yml + +name: Maturin Test + +on: + workflow_dispatch: + inputs: + branch: + description: 'Branch to run the workflow on' + required: true + default: 'main' +jobs: + build_linux: + runs-on: ubuntu-latest + steps: + - uses: PyO3/maturin-action@v1 + with: + command: build + args: --release From 2f0f708e8cd23b28b06e36619772d248699e3aa4 Mon Sep 17 00:00:00 2001 From: Olof Blomqvist Date: Tue, 1 Aug 2023 19:34:03 +0200 Subject: [PATCH 02/15] Update maturin-test.yml --- .github/workflows/maturin-test.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maturin-test.yml b/.github/workflows/maturin-test.yml index 8760309..fb9985f 100644 --- a/.github/workflows/maturin-test.yml +++ b/.github/workflows/maturin-test.yml @@ -10,10 +10,17 @@ on: required: true default: 'main' jobs: - build_linux: + build: runs-on: ubuntu-latest steps: - - uses: PyO3/maturin-action@v1 + - uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.11' + + - name: Build with Maturin + uses: PyO3/maturin-action@v1 with: command: build - args: --release + cargo-extra-args: --release From 614b34705d75fbf6a31cd2d7b2b663c7d00f04fb Mon Sep 17 00:00:00 2001 From: Olof Blomqvist Date: Tue, 1 Aug 2023 20:14:36 +0200 Subject: [PATCH 03/15] Update maturin-test.yml --- .github/workflows/maturin-test.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/maturin-test.yml b/.github/workflows/maturin-test.yml index fb9985f..9b825d4 100644 --- a/.github/workflows/maturin-test.yml +++ b/.github/workflows/maturin-test.yml @@ -13,6 +13,12 @@ jobs: build: runs-on: ubuntu-latest steps: + - name: Install Rust + uses: actions-rs/toolchain@v1 + with: + toolchain: nightly + target: x86_64-unknown-linux-musl + default: true - uses: actions/checkout@v2 - name: Set up Python uses: actions/setup-python@v2 From d85f4eaa35ea47b2a34405e9334c26831206c2ce Mon Sep 17 00:00:00 2001 From: Olof Blomqvist Date: Wed, 2 Aug 2023 07:24:49 +0200 Subject: [PATCH 04/15] Update maturin-test.yml --- .github/workflows/maturin-test.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/maturin-test.yml b/.github/workflows/maturin-test.yml index 9b825d4..989465e 100644 --- a/.github/workflows/maturin-test.yml +++ b/.github/workflows/maturin-test.yml @@ -13,13 +13,16 @@ jobs: build: runs-on: ubuntu-latest steps: + - name: Install Rust uses: actions-rs/toolchain@v1 with: toolchain: nightly target: x86_64-unknown-linux-musl default: true + - uses: actions/checkout@v2 + - name: Set up Python uses: actions/setup-python@v2 with: @@ -30,3 +33,11 @@ jobs: with: command: build cargo-extra-args: --release + manylinux: auto + + - name: Upload artifact + uses: actions/upload-artifact@v2 + with: + name: wheels + path: target/wheels + if-no-files-found: error # 'warn' or 'ignore' are also available, 'error' will fail the action if no files are found From 57e89ad8f376b27bc61d4b11b28d139dd540fb08 Mon Sep 17 00:00:00 2001 From: Olof Blomqvist Date: Wed, 2 Aug 2023 07:27:30 +0200 Subject: [PATCH 05/15] Update maturin-test.yml --- .github/workflows/maturin-test.yml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/.github/workflows/maturin-test.yml b/.github/workflows/maturin-test.yml index 989465e..b30d879 100644 --- a/.github/workflows/maturin-test.yml +++ b/.github/workflows/maturin-test.yml @@ -14,26 +14,16 @@ jobs: runs-on: ubuntu-latest steps: - - name: Install Rust - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - target: x86_64-unknown-linux-musl - default: true - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: '3.11' - - name: Build with Maturin uses: PyO3/maturin-action@v1 with: command: build - cargo-extra-args: --release + args: --release manylinux: auto + container: auto + rust-toolchain: nightly - name: Upload artifact uses: actions/upload-artifact@v2 From 5ad6746f1511de7aae5500b2acc14cfb63b2180d Mon Sep 17 00:00:00 2001 From: Olof Blomqvist Date: Wed, 2 Aug 2023 07:28:52 +0200 Subject: [PATCH 06/15] Update maturin-test.yml --- .github/workflows/maturin-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maturin-test.yml b/.github/workflows/maturin-test.yml index b30d879..f66e9d0 100644 --- a/.github/workflows/maturin-test.yml +++ b/.github/workflows/maturin-test.yml @@ -21,8 +21,8 @@ jobs: with: command: build args: --release - manylinux: auto - container: auto + manylinux: 2_24 + container: quay.io/pypa/manylinux_2_24_x86_64:latest rust-toolchain: nightly - name: Upload artifact From 0a56793c58792ca3ebfa6033ce861f3788f227ca Mon Sep 17 00:00:00 2001 From: Olof Blomqvist Date: Wed, 2 Aug 2023 07:29:10 +0200 Subject: [PATCH 07/15] Update maturin-test.yml --- .github/workflows/maturin-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maturin-test.yml b/.github/workflows/maturin-test.yml index f66e9d0..56cf297 100644 --- a/.github/workflows/maturin-test.yml +++ b/.github/workflows/maturin-test.yml @@ -21,7 +21,7 @@ jobs: with: command: build args: --release - manylinux: 2_24 + manylinux: auto container: quay.io/pypa/manylinux_2_24_x86_64:latest rust-toolchain: nightly From d140822e1f6eb6b3f4296fe14c5dcad0a35c80a3 Mon Sep 17 00:00:00 2001 From: Olof Blomqvist Date: Wed, 2 Aug 2023 07:31:48 +0200 Subject: [PATCH 08/15] Update maturin-test.yml --- .github/workflows/maturin-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maturin-test.yml b/.github/workflows/maturin-test.yml index 56cf297..f66e9d0 100644 --- a/.github/workflows/maturin-test.yml +++ b/.github/workflows/maturin-test.yml @@ -21,7 +21,7 @@ jobs: with: command: build args: --release - manylinux: auto + manylinux: 2_24 container: quay.io/pypa/manylinux_2_24_x86_64:latest rust-toolchain: nightly From 88fa34953fe75c79721e1041f95febf6171b419a Mon Sep 17 00:00:00 2001 From: Olof Blomqvist Date: Wed, 2 Aug 2023 07:38:08 +0200 Subject: [PATCH 09/15] Update maturin-test.yml --- .github/workflows/maturin-test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/maturin-test.yml b/.github/workflows/maturin-test.yml index f66e9d0..f053b92 100644 --- a/.github/workflows/maturin-test.yml +++ b/.github/workflows/maturin-test.yml @@ -21,8 +21,7 @@ jobs: with: command: build args: --release - manylinux: 2_24 - container: quay.io/pypa/manylinux_2_24_x86_64:latest + manylinux: auto rust-toolchain: nightly - name: Upload artifact From 63256fd6f155e096dc3f3f8fcdfb7868c2e381e2 Mon Sep 17 00:00:00 2001 From: Olof Blomqvist Date: Wed, 2 Aug 2023 07:46:59 +0200 Subject: [PATCH 10/15] Update and rename maturin-test.yml to wheely_manylinux_2_24.yml --- .../workflows/{maturin-test.yml => wheely_manylinux_2_24.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{maturin-test.yml => wheely_manylinux_2_24.yml} (94%) diff --git a/.github/workflows/maturin-test.yml b/.github/workflows/wheely_manylinux_2_24.yml similarity index 94% rename from .github/workflows/maturin-test.yml rename to .github/workflows/wheely_manylinux_2_24.yml index f053b92..00cc35e 100644 --- a/.github/workflows/maturin-test.yml +++ b/.github/workflows/wheely_manylinux_2_24.yml @@ -1,4 +1,4 @@ -# .github/workflows/maturin-test.yml +# .github/workflows/wheely_manylinux_2_24.yml name: Maturin Test From 979a4df1a69a4d4f2f0aa2c4748a39677b1f444d Mon Sep 17 00:00:00 2001 From: Olof Blomqvist Date: Wed, 2 Aug 2023 07:56:22 +0200 Subject: [PATCH 11/15] Update wheely_manylinux_2_24.yml --- .github/workflows/wheely_manylinux_2_24.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheely_manylinux_2_24.yml b/.github/workflows/wheely_manylinux_2_24.yml index 00cc35e..c5cc4aa 100644 --- a/.github/workflows/wheely_manylinux_2_24.yml +++ b/.github/workflows/wheely_manylinux_2_24.yml @@ -20,7 +20,7 @@ jobs: uses: PyO3/maturin-action@v1 with: command: build - args: --release + args: --release --interpreter python3.10 manylinux: auto rust-toolchain: nightly From 454a3558429c1cbcf33883ed7a7518928658b4ba Mon Sep 17 00:00:00 2001 From: Olof Blomqvist Date: Wed, 2 Aug 2023 08:09:27 +0200 Subject: [PATCH 12/15] Update wheely_manylinux_2_24.yml --- .github/workflows/wheely_manylinux_2_24.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheely_manylinux_2_24.yml b/.github/workflows/wheely_manylinux_2_24.yml index c5cc4aa..c50d63e 100644 --- a/.github/workflows/wheely_manylinux_2_24.yml +++ b/.github/workflows/wheely_manylinux_2_24.yml @@ -9,18 +9,28 @@ on: description: 'Branch to run the workflow on' required: true default: 'main' + jobs: build: - runs-on: ubuntu-latest + strategy: + matrix: + os: [ubuntu-latest, windows-latest, macos-latest] + python-version: ['3.10', '3.11'] + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 + - name: Install Python + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Build with Maturin uses: PyO3/maturin-action@v1 with: command: build - args: --release --interpreter python3.10 + args: --release --interpreter python${{ matrix.python-version }} manylinux: auto rust-toolchain: nightly From 70cee242f57473b3f822fd408d24cbdc4df6f32c Mon Sep 17 00:00:00 2001 From: Olof Blomqvist Date: Wed, 2 Aug 2023 08:19:41 +0200 Subject: [PATCH 13/15] Update and rename wheely_manylinux_2_24.yml to build_wheels.yml --- .../workflows/{wheely_manylinux_2_24.yml => build_wheels.yml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename .github/workflows/{wheely_manylinux_2_24.yml => build_wheels.yml} (94%) diff --git a/.github/workflows/wheely_manylinux_2_24.yml b/.github/workflows/build_wheels.yml similarity index 94% rename from .github/workflows/wheely_manylinux_2_24.yml rename to .github/workflows/build_wheels.yml index c50d63e..67a600a 100644 --- a/.github/workflows/wheely_manylinux_2_24.yml +++ b/.github/workflows/build_wheels.yml @@ -1,6 +1,6 @@ -# .github/workflows/wheely_manylinux_2_24.yml +# .github/workflows/build_wheels.yml -name: Maturin Test +name: Build Wheels on: workflow_dispatch: From e9a0d38484358c7f4a2e9dac676518ab804ad621 Mon Sep 17 00:00:00 2001 From: Olof Blomqvist Date: Wed, 2 Aug 2023 08:20:12 +0200 Subject: [PATCH 14/15] Update and rename wheely.yml to wheely_old.yml --- .github/workflows/{wheely.yml => wheely_old.yml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename .github/workflows/{wheely.yml => wheely_old.yml} (98%) diff --git a/.github/workflows/wheely.yml b/.github/workflows/wheely_old.yml similarity index 98% rename from .github/workflows/wheely.yml rename to .github/workflows/wheely_old.yml index ec9cb2e..84ad590 100644 --- a/.github/workflows/wheely.yml +++ b/.github/workflows/wheely_old.yml @@ -1,6 +1,6 @@ -# .github/workflows/on-push.yml +# .github/workflows/wheely_old.yml -name: Build Wheels +name: Build Wheels OLD on: workflow_dispatch: From dc6ec50a67e02aa1d5abcbd757cdbb32e6f2a711 Mon Sep 17 00:00:00 2001 From: Olof Blomqvist Date: Wed, 2 Aug 2023 09:18:53 +0200 Subject: [PATCH 15/15] Update readme.md --- readme.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/readme.md b/readme.md index a5b13cd..79b1bc9 100644 --- a/readme.md +++ b/readme.md @@ -30,10 +30,9 @@ pip install marlowe ``` -Or pip install wlh files directly: -- release versions: https://github.com/OlofBlomqvist/marlowe-py/releases -- latest builds artifact: https://github.com/OlofBlomqvist/marlowe-py/actions/workflows/wheely.yml - +Alternatives: +- pip install wlh files directly using builds artifacts from CI: https://github.com/OlofBlomqvist/marlowe-py/actions/workflows/build_wheels.yml +- clone the repo, install prereqs: rust,python,maturin; run wheels.ps1 or wheels.sh ### How to use