Skip to content

Commit 07f2516

Browse files
committed
Merge branch 'main' into extend_esa_cci_ozone_cmorizer
2 parents a105a72 + e977fce commit 07f2516

395 files changed

Lines changed: 18864 additions & 13092 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.circleci/config.yml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,12 @@ commands:
4141
command: |
4242
. /opt/conda/etc/profile.d/conda.sh
4343
conda activate esmvaltool
44-
mamba --version
44+
# Add existing Julia to PATH
45+
export PATH=/root/.juliaup/bin:$PATH
4546
pytest -n 4 --junitxml=test-reports/report.xml
4647
esmvaltool version
4748
esmvaltool -- --help
49+
esmvaltool develop compare -- --help
4850
ncl -V
4951
cdo --version
5052
- store_test_results:
@@ -86,16 +88,19 @@ commands:
8688
key: install-<< parameters.extra >>-{{ .Branch }}-{{ checksum "cache_key.txt" }}
8789
- run:
8890
name: Install dependencies
91+
no_output_timeout: 30m
8992
command: |
9093
# Install
9194
. /opt/conda/etc/profile.d/conda.sh
9295
mkdir /logs
9396
mamba --version
94-
mamba install -c conda-forge "mamba>=2" # mamba<2 can't solve env
95-
mamba env create -n esmvaltool -f environment.yml
97+
conda env create -n esmvaltool -f environment.yml --verbose
9698
conda activate esmvaltool
9799
mamba list >> /logs/conda.txt
98100
pip install << parameters.flags >> ".[<<parameters.extra>>]"> /logs/install.txt 2>&1
101+
curl -fsSL https://install.julialang.org | sh -s -- --yes
102+
export PATH=/root/.juliaup/bin:$PATH
103+
julia --version
99104
esmvaltool install Julia > /logs/install_julia.txt 2>&1
100105
if [[ "<<parameters.flags>>" != *'--editable'* ]]
101106
then
@@ -137,6 +142,9 @@ jobs:
137142
conda activate esmvaltool
138143
mkdir /logs
139144
pip install .[test] > /logs/install.txt 2>&1
145+
curl -fsSL https://install.julialang.org | sh -s -- --yes
146+
export PATH=/root/.juliaup/bin:$PATH
147+
julia --version
140148
esmvaltool install Julia > /logs/install_julia.txt 2>&1
141149
- run:
142150
name: Check Python code style and mistakes
@@ -198,17 +206,21 @@ jobs:
198206
key: test-upstream-{{ .Branch }}-{{ checksum "cache_key.txt" }}
199207
- run:
200208
name: Install
209+
no_output_timeout: 30m
201210
command: |
202211
# Install according to instructions on readthedocs with the
203212
# development version of ESMValTool and ESMValCore:
204213
# https://docs.esmvaltool.org/en/latest/quickstart/installation.html#install-from-source
205214
. /opt/conda/etc/profile.d/conda.sh
206215
mkdir /logs
207-
mamba install -c conda-forge "mamba>=2" # mamba<2 can't solve env
208-
mamba env create -n esmvaltool -f environment.yml
216+
conda env create -n esmvaltool -f environment.yml --verbose
209217
conda activate esmvaltool
210218
mamba list >> /logs/conda.txt
211219
pip install --editable .[develop]
220+
# Install Julia from source and add to PATH
221+
curl -fsSL https://install.julialang.org | sh -s -- --yes
222+
export PATH=/root/.juliaup/bin:$PATH
223+
julia --version
212224
esmvaltool install Julia > /logs/install_julia.txt 2>&1
213225
git clone https://github.com/ESMValGroup/ESMValCore $HOME/ESMValCore
214226
pip install --editable $HOME/ESMValCore[develop]
@@ -275,6 +287,10 @@ jobs:
275287
mamba create -y --name esmvaltool -c conda-forge esmvaltool julia 'python=3.11' >> /logs/conda.txt 2>&1
276288
# Activate the environment
277289
set +x; conda activate esmvaltool; set -x
290+
# install Julia from source and add to PATH
291+
curl -fsSL https://install.julialang.org | sh -s -- --yes
292+
export PATH=/root/.juliaup/bin:$PATH
293+
julia --version
278294
# install the Julia dependencies
279295
esmvaltool install Julia > /logs/install_Julia.txt 2>&1
280296
# Log versions

.codacy.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ engines:
1919
python_version: 3
2020

2121
exclude_paths: [
22+
'archive/**',
2223
'doc/sphinx/**',
2324
'esmvaltool/cmor/tables/**',
2425
'tests/**',
25-
'esmvaltool/utils/recipe_test_workflow/app/configure/bin/test_configure.py'
26+
'esmvaltool/utils/recipe_test_workflow/app/configure/bin/test_configure.py',
27+
'esmvaltool/utils/recipe_test_workflow/app/generate_report/bin/test_generate_html_report.py',
2628
]

.github/workflows/create-condalock-file.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,13 @@ jobs:
2828
with:
2929
auto-update-conda: true
3030
activate-environment: esmvaltool-fromlock
31-
python-version: "3.12"
31+
python-version: "3.13"
3232
miniforge-version: "latest"
3333
use-mamba: true
3434
- name: Show conda config
3535
run: |
3636
conda update -n base -c conda-forge conda
3737
conda --version
38-
# setup-miniconda@v3 installs an old conda and mamba
39-
# forcing a modern mamba updates both mamba and conda
40-
# unpin mamba after conda-lock=3 release
41-
# see github.com/ESMValGroup/ESMValTool/issues/3782
42-
conda install -c conda-forge "mamba>=1.4.8,<2"
43-
conda config --show-sources
44-
conda config --show
45-
conda --version
4638
mamba --version
4739
- name: Python info
4840
run: |

.github/workflows/install-from-conda.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
python-version: ["3.10", "3.11", "3.12"]
24+
python-version: ["3.11", "3.12"] # add "3.13" when pkg built
2525
name: Linux Python ${{ matrix.python-version }}
2626
steps:
2727
- uses: conda-incubator/setup-miniconda@v3
@@ -57,7 +57,7 @@ jobs:
5757
# if: github.repository == 'ESMValGroup/ESMValTool' # avoid GAs in forks
5858
# strategy:
5959
# matrix:
60-
# python-version: ["3.10", "3.11"]
60+
# python-version: ["3.11"]
6161
# fail-fast: false
6262
# name: OSX Python ${{ matrix.python-version }}
6363
# steps:

.github/workflows/install-from-condalock-file.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
if: github.repository == 'ESMValGroup/ESMValTool' # avoid GAs in forks
3232
strategy:
3333
matrix:
34-
python-version: ["3.10", "3.11", "3.12"]
34+
python-version: ["3.11", "3.12", "3.13"]
3535
fail-fast: false
3636
name: Linux Python ${{ matrix.python-version }}
3737
steps:

.github/workflows/install-from-source.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
if: github.repository == 'ESMValGroup/ESMValTool' # avoid GAs in forks
2121
strategy:
2222
matrix:
23-
python-version: ["3.10", "3.11", "3.12"]
23+
python-version: ["3.11", "3.12", "3.13"]
2424
fail-fast: false
2525
name: Linux Python ${{ matrix.python-version }}
2626
steps:
@@ -61,7 +61,7 @@ jobs:
6161
# if: github.repository == 'ESMValGroup/ESMValTool' # avoid GAs in forks
6262
# strategy:
6363
# matrix:
64-
# python-version: ["3.10", "3.11"]
64+
# python-version: ["3.11"]
6565
# fail-fast: false
6666
# name: OSX Python ${{ matrix.python-version }}
6767
# steps:

.github/workflows/pypi-build-and-deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
- uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 0
20-
- name: Set up Python 3.12
20+
- name: Set up Python 3.13
2121
uses: actions/setup-python@v1
2222
with:
23-
python-version: "3.12"
23+
python-version: "3.13"
2424
- name: Install pep517
2525
run: >-
2626
python -m

.github/workflows/run-tests-monitor.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
python-version: ["3.10", "3.11", "3.12"]
27+
python-version: ["3.11", "3.12", "3.13"]
2828
name: Linux Python ${{ matrix.python-version }}
2929
steps:
3030
- uses: actions/checkout@v4
@@ -49,6 +49,8 @@ jobs:
4949
run: pip install pytest-monitor
5050
- name: Install ESMValTool
5151
run: pip install -e .[develop] 2>&1 | tee test_linux_artifacts_python_${{ matrix.python-version }}/install.txt
52+
- name: Install Julia from source
53+
run: curl -fsSL https://install.julialang.org | sh -s -- --yes
5254
- name: Install Julia dependencies
5355
run: esmvaltool install Julia
5456
- name: Run tests
@@ -68,7 +70,7 @@ jobs:
6870
runs-on: "macos-latest"
6971
strategy:
7072
matrix:
71-
python-version: ["3.10", "3.11", "3.12"]
73+
python-version: ["3.11", "3.12", "3.13"]
7274
architecture: ["x64"] # need to force Intel, arm64 builds have issues
7375
fail-fast: false
7476
name: OSX Python ${{ matrix.python-version }}

.github/workflows/stale.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Close stale issues and pull requests
2+
3+
on:
4+
schedule:
5+
# Run once a day
6+
- cron: "30 1 * * *"
7+
8+
jobs:
9+
stale:
10+
if: "github.repository == 'ESMValGroup/ESMValTool'"
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/stale@v9
14+
with:
15+
days-before-issue-stale: 1080
16+
days-before-pr-stale: 360
17+
days-before-close: 60
18+
ascending: true
19+
operations-per-run: 300
20+
stale-issue-message: |
21+
In order to maintain a backlog of relevant issues, we automatically label them as stale after 1080 days of inactivity.
22+
23+
If this issue is still important to you, please comment below to remove the stale label. Otherwise, this issue will be automatically closed in 60 days.
24+
stale-pr-message: |
25+
In order to maintain a backlog of relevant pull requests, we automatically label them as stale after 360 days of inactivity.
26+
27+
If this pull request is still important to you, please comment below to remove the stale label. Otherwise, this pull request will be automatically closed in 60 days. If this pull request only suffers from a lack of reviewers, please have a look at [our documentation](https://docs.esmvaltool.org/en/latest/community/review.html#how-do-i-request-a-review-of-my-pull-request) and follow the steps described there.
28+
close-issue-message: |
29+
This stale issue has been automatically closed due to a lack of community activity.
30+
31+
If you still care about this issue, please re-open it. If you do not have sufficient permissions for this, tag the @<span></span>ESMValGroup/technical-lead-development-team and @<span></span>ESMValGroup/scientific-lead-development-team in a comment below including a short message that this issue is still relevant to you. They will re-open it on your behalf.
32+
close-pr-message: |
33+
This stale pull request has been automatically closed due to a lack of community activity.
34+
35+
If you still care about this pull request, please re-open it. If you do not have sufficient permissions for this, tag the @<span></span>ESMValGroup/technical-lead-development-team and @<span></span>ESMValGroup/scientific-lead-development-team in a comment below including a short message that this pull request is still relevant to you. They will re-open it on your behalf.

.github/workflows/test-development.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
fail-fast: false
2929
matrix:
30-
python-version: ["3.10", "3.11", "3.12"]
30+
python-version: ["3.11", "3.12", "3.13"]
3131
name: Linux Python ${{ matrix.python-version }}
3232
steps:
3333
- uses: actions/checkout@v4
@@ -48,6 +48,8 @@ jobs:
4848
python -V 2>&1 | tee develop_test_linux_artifacts_python_${{ matrix.python-version }}/python_version.txt
4949
- name: Install ESMValTool
5050
run: pip install -e .[develop] 2>&1 | tee develop_test_linux_artifacts_python_${{ matrix.python-version }}/install.txt
51+
- name: Install Julia from source
52+
run: curl -fsSL https://install.julialang.org | sh -s -- --yes
5153
- name: Install Julia dependencies
5254
run: esmvaltool install Julia
5355
- name: Install development version of ESMValCore

0 commit comments

Comments
 (0)