Skip to content

Commit

Permalink
Merge remote-tracking branch 'public/main' into add_basic_iconeval_re…
Browse files Browse the repository at this point in the history
…cipe
  • Loading branch information
schlunma committed Nov 10, 2023
2 parents e159ef2 + d14c309 commit e9bedb6
Show file tree
Hide file tree
Showing 72 changed files with 4,155 additions and 915 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ jobs:
conda activate esmvaltool
mkdir -p ~/climate_data
esmvaltool config get_config_user
echo "offline: false" >> ~/.esmvaltool/config-user.yml
echo "search_esgf: when_missing" >> ~/.esmvaltool/config-user.yml
cat ~/.esmvaltool/config-user.yml
for recipe in esmvaltool/recipes/testing/recipe_*.yml; do
esmvaltool run "$recipe"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
push:
branches:
- main
- fix_recipe_filler_bkwds_incompatibility
schedule:
- cron: '0 0 * * *'

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
push:
branches:
- main
- fix_recipe_filler_bkwds_incompatibility
schedule:
- cron: '0 0 * * *'

Expand Down
4 changes: 3 additions & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ build:
jobs:
pre_create_environment:
# update mamba just in case
- mamba update --yes --quiet --name=base mamba
- mamba update --yes --quiet --name=base mamba 'zstd=1.5.2'
- mamba --version
- mamba list --name=base
post_create_environment:
- conda run -n ${CONDA_DEFAULT_ENV} mamba list
# use conda run executable wrapper to have all env variables
- conda run -n ${CONDA_DEFAULT_ENV} mamba --version
- conda run -n ${CONDA_DEFAULT_ENV} pip install . --no-deps
Expand Down
Loading

0 comments on commit e9bedb6

Please sign in to comment.