diff --git a/.github/workflows/_build-package.yml b/.github/workflows/_build-package.yml index 89dd18b..6b4dafd 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 83cc05d..fde9594 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 diff --git a/.github/workflows/formatting_linting.yml b/.github/workflows/formatting_linting.yml index e4abf40..2874b5d 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/prolif/_version.py b/prolif/_version.py index 1290be1..ddcc789 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" diff --git a/pyproject.toml b/pyproject.toml index 126e1b9..6ca74a0 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" },