From c3771131e2370b129a1a7ada7e9b05ef4546f699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bouysset?= Date: Thu, 30 Oct 2025 01:59:46 +0000 Subject: [PATCH 1/3] chore: sync ruff version between pipeline and pyproject specs --- .github/workflows/formatting_linting.yml | 4 ++-- pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/formatting_linting.yml b/.github/workflows/formatting_linting.yml index e4abf40f..2874b5d4 100644 --- a/.github/workflows/formatting_linting.yml +++ b/.github/workflows/formatting_linting.yml @@ -18,7 +18,7 @@ jobs: - name: Code formatting uses: astral-sh/ruff-action@v2 with: - version: 0.9.10 + version: 0.11.2 args: "format --diff" - name: Notebook formatting @@ -30,5 +30,5 @@ jobs: - name: Code linting uses: astral-sh/ruff-action@v2 with: - version: 0.9.10 + version: 0.11.2 args: "check --preview --diff" \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 126e1b91..6ca74a06 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -71,7 +71,7 @@ type-check = [ "types-networkx", ] dev = [ - "ruff==0.11.2", + "ruff==0.11.2", # keep synced with formatting_linting.yml "black[jupyter]", "poethepoet>=0.33.0", { include-group = "tests" }, From 6ce008fb8303f91c4c1eeec1d0322c465a68e1a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bouysset?= Date: Thu, 30 Oct 2025 02:00:16 +0000 Subject: [PATCH 2/3] fix: race condition during cache retrieval --- .github/workflows/_build-package.yml | 5 +++-- .github/workflows/build.yml | 9 ++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/_build-package.yml b/.github/workflows/_build-package.yml index 89dd18b8..6b4dafd9 100644 --- a/.github/workflows/_build-package.yml +++ b/.github/workflows/_build-package.yml @@ -40,6 +40,7 @@ jobs: if [[ "${GITHUB_REF}" == refs/tags/* ]]; then TAG=${GITHUB_REF#refs/*/} sed -i -e "s/0.0.0/${TAG#v}/" pyproject.toml + echo "Version detected as ${TAG#v}" fi - name: Build package @@ -74,7 +75,7 @@ jobs: path: | dist/prolif-*.whl dist/prolif-*.tar.gz - key: prolif-${{ runner.os }}-${{ github.sha }} + key: prolif-${{ runner.os }}-${{ github.sha }}-${{ github.ref_type }} - name: Expose package as artifact if: inputs.upload-package @@ -114,7 +115,7 @@ jobs: path: | dist/prolif-*.whl dist/prolif-*.tar.gz - key: prolif-${{ runner.os }}-${{ github.sha }} + key: prolif-${{ runner.os }}-${{ github.sha }}-${{ github.ref_type }} - name: Install from tar.gz run: | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 83cc05d6..fde9594f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,9 @@ jobs: publish: name: Publish to PyPI runs-on: ubuntu-latest + needs: [build] steps: + - name: Retrieve cached package uses: actions/cache/restore@v3 id: cache-prolif @@ -32,7 +34,12 @@ jobs: path: | dist/prolif-*.whl dist/prolif-*.tar.gz - key: prolif-${{ runner.os }}-${{ github.sha }} + key: prolif-${{ runner.os }}-${{ github.sha }}-${{ github.ref_type }} + fail-on-cache-miss: true + + - name: List output + run: | + ls -lah dist/* - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 From 54ff621c94065d370ecd2a6149a381bdd5a14607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bouysset?= Date: Thu, 30 Oct 2025 02:08:40 +0000 Subject: [PATCH 3/3] fix: __version__ metadata --- prolif/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prolif/_version.py b/prolif/_version.py index 1290be1b..ddcc7898 100644 --- a/prolif/_version.py +++ b/prolif/_version.py @@ -1,6 +1,6 @@ import importlib.metadata try: - __version__ = importlib.metadata.version(__name__) + __version__ = importlib.metadata.version("prolif") except importlib.metadata.PackageNotFoundError: __version__ = "0.0.0"