Fixlocks (#470)

* Relax numpy pin : cf #472 * Modernise base env for lock creation.
SciTools · Sep 24, 2024 · 7d8c497 · 7d8c497
1 parent cc0ea12
commit 7d8c497
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/ci-locks.yml b/.github/workflows/ci-locks.yml
@@ -43,7 +43,7 @@ jobs:
       uses: actions/cache@v4.0.2
       env:
         # Increment the build number to force a cache refresh.
-        CACHE_BUILD: 2
+        CACHE_BUILD: 5
       with:
         path: ~/conda_pkgs_dir
         key: ${{ runner.os }}-conda-pkgs-${{ env.ENV_NAME }}-p${{ env.CACHE_PERIOD }}-b${{ env.CACHE_BUILD }}
@@ -52,17 +52,16 @@ jobs:
       uses: conda-incubator/setup-miniconda@v3
       with:
         miniforge-version: latest
-        channels: conda-forge,defaults
+        channels: conda-forge
         activate-environment: ${{ env.ENV_NAME }}
         auto-update-conda: true
-        use-only-tar-bz2: true
 
     - name: "Conda environment cache"
       id: conda-env-cache
       uses: actions/cache@v4.0.2
       env:
         # Increment the build number to force a cache refresh.
-        CACHE_BUILD: 2
+        CACHE_BUILD: 5
       with:
         path: ${{ env.CONDA }}/envs/${{ env.ENV_NAME }}
         key: ${{ runner.os }}-conda-env-${{ env.ENV_NAME }}-p${{ env.CACHE_PERIOD }}-b${{ env.CACHE_BUILD }}
@@ -81,7 +80,7 @@ jobs:
       uses: actions/cache@v4.0.2
       env:
         # Increment the build number to forece a cache refresh.
-        CACHE_BUILD: 2
+        CACHE_BUILD: 5
         TOX_INI: ${{ github.workspace }}/tox.ini
       with:
         path: ${{ github.workspace }}/.tox

diff --git a/requirements/cf-units.yml b/requirements/cf-units.yml
@@ -13,7 +13,7 @@ dependencies:
 # core dependencies
   - antlr-python-runtime 4.11.1.*  # To update this, see cf_units/_udunits2_parser/README.md
   - cftime>=1.2
-  - numpy==1.26.4
+  - numpy<2
   - udunits2
 
 # test dependencies