Skip to content

Fixlocks #470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trexfeathers merged 2 commits into from
Sep 24, 2024
Merged

Fixlocks #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1d38d6
Relax numpy pin : cf #472
pp-mo Sep 24, 2024
394566e
Modernise base env for lock creation.
pp-mo Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/ci-locks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/cf-units.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member Author

@pp-mo pp-mo Sep 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note

- udunits2

# test dependencies
Expand Down