From a1d38d63325d40fad689a492398f3e17db518eac Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Tue, 24 Sep 2024 13:23:59 +0100 Subject: [PATCH 1/2] Relax numpy pin : cf #472 --- requirements/cf-units.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/cf-units.yml b/requirements/cf-units.yml index 80ad5db4..69b92a83 100644 --- 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 From 394566e9ecb40f32ee7b0c74c346e2d528c44ec5 Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Tue, 24 Sep 2024 13:26:25 +0100 Subject: [PATCH 2/2] Modernise base env for lock creation. --- .github/workflows/ci-locks.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-locks.yml b/.github/workflows/ci-locks.yml index 952b3433..aec75ffb 100644 --- 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