From b9b99093f1881812b502520be957b4dfe14459e8 Mon Sep 17 00:00:00 2001 From: Peter Schutt Date: Sun, 26 May 2024 09:12:31 +1000 Subject: [PATCH 1/9] chore: update build action versions --- .github/workflows/CI.yml | 47 +++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index de3df96..f6a4422 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,58 +11,75 @@ jobs: target: [x86_64, aarch64] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: messense/maturin-action@v1 + - uses: actions/checkout@v4 + - uses: PyO3/maturin-action@v1 with: manylinux: auto command: build target: ${{ matrix.target }} args: --release --sdist -o dist --find-interpreter - name: Upload wheels - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels_${{ matrix.target }} path: dist windows: runs-on: windows-latest steps: - - uses: actions/checkout@v3 - - uses: messense/maturin-action@v1 + - uses: actions/checkout@v4 + - uses: PyO3/maturin-action@v1 with: command: build args: --release -o dist --find-interpreter - name: Upload wheels - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels_windows path: dist macos: runs-on: macos-latest steps: - - uses: actions/checkout@v3 - - uses: messense/maturin-action@v1 + - uses: actions/checkout@v4 + - uses: PyO3/maturin-action@v1 with: command: build args: --release -o dist --universal2 --find-interpreter - name: Upload wheels - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels_macos path: dist + test-release: + name: Test Release + runs-on: ubuntu-latest + needs: [ macos, windows, linux ] + steps: + - uses: actions/download-artifact@v4 + with: + pattern: wheels_* + merge-multiple: true + path: dist + - name: Test Archive Download + run: | + echo "Testing archive download" + ls -la dist # List the contents to confirm download + release: name: Release runs-on: ubuntu-latest if: "startsWith(github.ref, 'refs/tags/')" needs: [ macos, windows, linux ] steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v4 with: - name: wheels + pattern: wheels_* + merge-multiple: true + path: dist - name: Publish to PyPI - uses: messense/maturin-action@v1 + uses: PyO3/maturin-action@v1 env: MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }} with: From 88bb211e2234bb4047bbbc4c2dc2598568b8a1db Mon Sep 17 00:00:00 2001 From: Peter Schutt Date: Sun, 26 May 2024 09:59:40 +1000 Subject: [PATCH 2/9] chore: update maturin version --- .github/workflows/CI.yml | 3 ++- pyproject.toml | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index f6a4422..2b8cf9d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -45,7 +45,8 @@ jobs: - uses: PyO3/maturin-action@v1 with: command: build - args: --release -o dist --universal2 --find-interpreter + target: universal2 + args: --release -o dist --find-interpreter - name: Upload wheels uses: actions/upload-artifact@v4 with: diff --git a/pyproject.toml b/pyproject.toml index 94cff6f..50aaffd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["maturin>=0.13,<0.14"] +requires = ["maturin>=1.0,<2.0"] build-backend = "maturin" [project] @@ -19,6 +19,9 @@ author_email = "maurice@mauriceberk.com" url = "https://github.com/mberk/shin" readme = "README.md" +[tool.maturin] +python-source = "python" + [tool.mypy] python_version = "3.9" packages = ["shin", "tests"] From d9942185c4672740f0385586038d86cc05fc68bb Mon Sep 17 00:00:00 2001 From: Peter Schutt Date: Sun, 26 May 2024 10:45:27 +1000 Subject: [PATCH 3/9] feat: musl builds --- .github/workflows/CI.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 2b8cf9d..fd58f94 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -9,19 +9,26 @@ jobs: strategy: matrix: target: [x86_64, aarch64] + manylinux: [auto] + include: + - target: x86_64 + manylinux: musllinux_1_1 + - target: aarch64 + manylinux: musllinux_1_1 runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: PyO3/maturin-action@v1 with: - manylinux: auto + manylinux: ${{ matrix.manylinux }} command: build target: ${{ matrix.target }} - args: --release --sdist -o dist --find-interpreter + # https://github.com/PyO3/maturin-action/issues/56 + args: --release --sdist -o dist --interpreter 3.9 3.10 3.11 3.12 pypy3.9 pypy3.10 - name: Upload wheels uses: actions/upload-artifact@v4 with: - name: wheels_${{ matrix.target }} + name: wheels_${{ matrix.target }}_${{ matrix.manylinux }} path: dist windows: From 52838e771c4b35b784e3c4ba35d72c8b87ce1cc4 Mon Sep 17 00:00:00 2001 From: Peter Schutt Date: Sun, 26 May 2024 11:29:49 +1000 Subject: [PATCH 4/9] fix: update pyproject.toml according to spec Authors: https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#authors-maintainers Project URLs: https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#urls --- pyproject.toml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 50aaffd..b1ff1ac 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,11 +14,14 @@ classifiers = [ ] version = "0.2.0" description = "Python implementation of Shin's method for calculating implied probabilities from bookmaker odds" -author = "Maurice Berk" -author_email = "maurice@mauriceberk.com" -url = "https://github.com/mberk/shin" +authors = [ + {name = "Maurice Berk", email = "maurice@mauriceberk.com"}, +] readme = "README.md" +[project.urls] +Repository = "https://github.com/mberk/shin" + [tool.maturin] python-source = "python" From d40e9a4f8001db14e822bacefae1706f49545d01 Mon Sep 17 00:00:00 2001 From: Maurice Berk Date: Sat, 4 Jan 2025 15:57:47 +0000 Subject: [PATCH 5/9] Remove job --- .github/workflows/CI.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index fd58f94..bfff00f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -60,21 +60,6 @@ jobs: name: wheels_macos path: dist - test-release: - name: Test Release - runs-on: ubuntu-latest - needs: [ macos, windows, linux ] - steps: - - uses: actions/download-artifact@v4 - with: - pattern: wheels_* - merge-multiple: true - path: dist - - name: Test Archive Download - run: | - echo "Testing archive download" - ls -la dist # List the contents to confirm download - release: name: Release runs-on: ubuntu-latest From ec8a1f9ddea45dcede5ffe9a25053b56e7b31962 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 4 Jan 2025 16:24:52 +0000 Subject: [PATCH 6/9] Bump actions/download-artifact from 2 to 4.1.7 in /.github/workflows (#12) Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 2 to 4.1.7. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v2...v4.1.7) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mberk --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index bfff00f..a675435 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -66,7 +66,7 @@ jobs: if: "startsWith(github.ref, 'refs/tags/')" needs: [ macos, windows, linux ] steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v4.1.7 with: pattern: wheels_* merge-multiple: true From 59c0d7096537a9a06a22e3a8c55503861f4d5f18 Mon Sep 17 00:00:00 2001 From: Maurice Berk Date: Sat, 4 Jan 2025 16:27:03 +0000 Subject: [PATCH 7/9] Bump version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b1ff1ac..e967f57 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ classifiers = [ "License :: OSI Approved :: MIT License", "Operating System :: OS Independent" ] -version = "0.2.0" +version = "0.2.1" description = "Python implementation of Shin's method for calculating implied probabilities from bookmaker odds" authors = [ {name = "Maurice Berk", email = "maurice@mauriceberk.com"}, From af297a142f36d122d96f2d5e4b6a7d34ec8f460b Mon Sep 17 00:00:00 2001 From: Maurice Berk Date: Sat, 4 Jan 2025 16:28:46 +0000 Subject: [PATCH 8/9] Update HISTORY.md --- HISTORY.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/HISTORY.md b/HISTORY.md index 6abd8e2..bd1d6dc 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,11 @@ # Release History +## 0.2.1 - 2025-01-04 + +### Changed + +* Improved CI + ## 0.2.0 - 2024-04-27 ### Added From f86e706982f4a03fdfda883d6b4944d0b9c52930 Mon Sep 17 00:00:00 2001 From: Maurice Berk Date: Sun, 5 Jan 2025 08:44:35 +0000 Subject: [PATCH 9/9] Update date --- HISTORY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index bd1d6dc..50c32f4 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,6 +1,6 @@ # Release History -## 0.2.1 - 2025-01-04 +## 0.2.1 - 2025-01-05 ### Changed