Merge pull request #57 from climate-resource/hot-fixes

Hot fixes

.github/actions/setup/action.yml

@@ -18,6 +18,8 @@ runs:
         # pre-commit ensures that pixi.lock is up to date with pyproject.toml,
         # hence here we can just follow the lock file exactly
         frozen: true
-        # Pixi breaks our CI if we use `locked: true` here
+        # Pixi breaks our entire CI if we use `locked: true` here
         # because it thinks we need to update our lock file
         # when we update our version number in `pyproject.toml`.
+        # We check the locked status using the `check-lock-file` job
+        # in the CI workflow instead.

.github/workflows/ci.yaml

@@ -17,7 +17,7 @@ jobs:
         with:
           pixi-environments: "all-dev"
       - name: mypy
-        run: MYPYPATH=stubs pixi run -e all-dev mypy src
+        run: MYPYPATH=stubs pixi run --frozen -e all-dev mypy src
 
   docs:
     if: ${{ !github.event.pull_request.draft }}
@@ -30,11 +30,11 @@ jobs:
           pixi-environments: "docs"
       - name: docs
         run: |
-          pixi run -e docs typer input4mips_validation.cli utils docs --output docs/cli/index.md --name input4mips-validation
-          pixi run -e docs mkdocs build --strict
+          pixi run --frozen -e docs typer input4mips_validation.cli utils docs --output docs/cli/index.md --name input4mips-validation
+          pixi run --frozen -e docs mkdocs build --strict
           # Check CHANGELOG will build too
-          pixi run -e all-dev towncrier build --yes
-          pixi run -e all-dev mkdocs build --strict
+          pixi run --frozen -e all-dev towncrier build --yes
+          pixi run --frozen -e all-dev mkdocs build --strict
           # Just in case, undo the staged changes
           git restore --staged . && git restore .
 
@@ -59,8 +59,8 @@ jobs:
           pixi-environments: "test-${{ matrix.test-python-id }}"
       - name: Run tests
         run: |
-          pixi run -e "test-${{ matrix.test-python-id }}" pytest -r a -v src tests --doctest-modules --cov=src --cov-report=term-missing --cov-report=xml
-          pixi run -e "test-${{ matrix.test-python-id }}"  coverage report
+          pixi run --frozen -e "test-${{ matrix.test-python-id }}" pytest -r a -v src tests --doctest-modules --cov=src --cov-report=term-missing --cov-report=xml
+          pixi run --frozen -e "test-${{ matrix.test-python-id }}"  coverage report
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v3
 
@@ -78,7 +78,7 @@ jobs:
         with:
           pixi-environments: "${{ matrix.python-id }}"
       - name: Check importable without extras
-        run: pixi run -e "${{ matrix.python-id }}" python scripts/test-install.py
+        run: pixi run --frozen -e "${{ matrix.python-id }}" python scripts/test-install.py
 
   check-build:
     runs-on: ubuntu-latest
@@ -97,6 +97,15 @@ jobs:
           tar -tvf dist/input4mips_validation-*.tar.gz --wildcards '*input4mips_validation/py.typed'
           tar -tvf dist/input4mips_validation-*.tar.gz --wildcards 'input4mips_validation-*/LICENCE'
 
+  check-lock-file:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+      - name: Check locked install
+        uses: prefix-dev/setup-pixi@v0.8.1
+        with:
+          locked: true
 
   # # Not sure how to do this with conda in the mix yet,
   # # hence leave out for now

changelog/57.trivial.md

@@ -0,0 +1 @@
+Attempted to fix the fact that our CI breaks after bumping (x-ref [#35](https://github.com/climate-resource/input4mips_validation/issues/35)) and pinned towncrier while [towncrier/#648](https://github.com/twisted/towncrier/issues/648) is ongoing

docs/changelog.md

@@ -19,7 +19,7 @@ of rst and use slightly different categories.
 
 <!-- towncrier release notes start -->
 
-# ## input4mips-validation v0.11.1 (2024-08-03)
+## input4mips-validation v0.11.1 (2024-08-03)
 
 ### 🎉 Improvements
 

pyproject.toml

@@ -37,7 +37,7 @@ loguru-config = [
 dev = [
     "pre-commit>=3.7.1",
     "mypy>=1.10.1",
-    "towncrier>=23.11.0",
+    "towncrier>=23.11.0,<24",
     "packaging>=24.1.0",
     "pandas-stubs>=2.2.2.240603",
     "tomli>=2.0.1",

requirements.txt

@@ -3,7 +3,7 @@
 
 antlr4-python3-runtime==4.7.2
 appdirs==1.4.4
-attrs==23.2.0
+attrs==24.1.0
 cartopy==0.23.0
 cattrs==23.2.3
 certifi==2024.7.4
@@ -35,7 +35,7 @@ locket==1.0.0
 loguru==0.7.2
 markdown-it-py==3.0.0
 markupsafe==2.1.5
-matplotlib==3.9.1
+matplotlib==3.9.0
 mdurl==0.1.2
 ncdata==0.1.1
 netcdf4==1.7.1.post1
@@ -63,7 +63,7 @@ shapely==2.0.5
 shellingham==1.5.4
 six==1.16.0
 toolz==0.12.1
-tqdm==4.66.4
+tqdm==4.66.5
 typer==0.12.3
 typing-extensions==4.12.2
 tzdata==2024.1