Skip to content

Commit e29daaf

Browse files
committed
Merge branch 'main' into 3873_use_site_directories
* main: (43 commits) use python-only environment file for Circle build documentation (#3981) Added option to plot horizontal lines in monitoring line plots (#3977) [Condalock] Update Linux condalock file (#3974) Run esmvalbot test PR twice a month (#3976) unpin upper limit `r-base` (#3971) [Condalock] Update Linux condalock file (#3968) Update CMORizer for OSI-450 aka OSISAF/CCI (sea ice concentration) (#3963) Add recipe for seasonal cycle and time series of Arctic/Antarctic sea ice area (REF) (#3891) use Python-only environment for ReadTheDocs builds (#3955) [Condalock] Update Linux condalock file (#3961) Create scatterplots for the REF (#3923) [Condalock] Update Linux condalock file (#3957) Unsafe and manual fixes Automatic fixes Replace flake8, yapf, and isort with ruff Add recipe and diagnostic for ZEC (Zero Emissions Commitment) (#3897) Update ESACCI-OZONE CMORizer(formatter and downloader) for REF (#3899) Update citation and changelog for version 2.12 (#3945) use mamba>=2 for Circle CI upstream development test (#3949) Force install mamba2 in CircleCI and add ipython and pin it to <9.0 (#3947) ...
2 parents e15ac68 + 5d5d727 commit e29daaf

File tree

615 files changed

+39989
-26496
lines changed

Some content is hidden

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

615 files changed

+39989
-26496
lines changed

.circleci/config.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ commands:
9090
# Install
9191
. /opt/conda/etc/profile.d/conda.sh
9292
mkdir /logs
93-
mamba env create
93+
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
9496
conda activate esmvaltool
9597
mamba list >> /logs/conda.txt
9698
pip install << parameters.flags >> ".[<<parameters.extra>>]"> /logs/install.txt 2>&1
@@ -105,7 +107,7 @@ commands:
105107
command: |
106108
. /opt/conda/etc/profile.d/conda.sh
107109
conda activate esmvaltool
108-
flake8 -j 4
110+
pre-commit run --all
109111
- test_and_report
110112
- save_cache:
111113
key: install-<< parameters.extra >>-{{ .Branch }}-{{ checksum "cache_key.txt" }}
@@ -141,7 +143,7 @@ jobs:
141143
command: |
142144
. /opt/conda/etc/profile.d/conda.sh
143145
conda activate esmvaltool
144-
flake8 -j 4
146+
pre-commit run --all
145147
- run:
146148
name: Remove source code to test the installed software
147149
command: rm -r esmvaltool
@@ -202,7 +204,8 @@ jobs:
202204
# https://docs.esmvaltool.org/en/latest/quickstart/installation.html#install-from-source
203205
. /opt/conda/etc/profile.d/conda.sh
204206
mkdir /logs
205-
mamba env create
207+
mamba install -c conda-forge "mamba>=2" # mamba<2 can't solve env
208+
mamba env create -n esmvaltool -f environment.yml
206209
conda activate esmvaltool
207210
mamba list >> /logs/conda.txt
208211
pip install --editable .[develop]
@@ -244,7 +247,7 @@ jobs:
244247
mkdir /logs
245248
. /opt/conda/etc/profile.d/conda.sh
246249
# Install
247-
mamba env create
250+
mamba env create -n esmvaltool -f environment_python.yml
248251
conda activate esmvaltool
249252
pip install .[doc]
250253
# Log versions

.codacy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
engines:
66
coverage:
7-
enabled: true
7+
enabled: false
88
exclude_paths: [
99
'tests',
1010
]

.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ ESMValTool.egg-info
77

88
!.git
99
!.zenodo.json
10-

.editorconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,3 @@ indent_size = 2
2727

2828
[*.{md,Rmd}]
2929
trim_trailing_whitespace = false
30-

.github/workflows/check-rtw.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
check-rtw:
2929
# The type of runner that the job will run on
3030
runs-on: ubuntu-latest
31+
if: github.event_name != 'schedule' || github.repository == 'ESMValGroup/ESMValTool' # avoid scheduled GHAs in forks
3132

3233
# Steps represent a sequence of tasks that will be executed as part
3334
# of the job

.github/workflows/citation_file_validator.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
validate:
1515
name: "validate"
1616
runs-on: ubuntu-latest
17+
if: github.event_name != 'schedule' || github.repository == 'ESMValGroup/ESMValTool' # avoid scheduled GHAs in forks
1718
steps:
1819
- name: Check out a copy of the repository
1920
uses: actions/checkout@v4

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
create-lock-file:
2020
name: Create conda lock file for latest Python
2121
runs-on: 'ubuntu-latest'
22+
if: github.repository == 'ESMValGroup/ESMValTool' # avoid GAs in forks
2223
steps:
2324
- uses: actions/checkout@v4
2425
with:
@@ -73,8 +74,8 @@ jobs:
7374
run: esmvaltool --help
7475
- name: Check ESMValTool help
7576
run: esmvaltool version
76-
- name: Run flake8
77-
run: flake8
77+
- name: Check code quality
78+
run: pre-commit run -a
7879
- name: Run tests
7980
run: pytest -n 2 -m "not installation"
8081
# Automated PR

.github/workflows/cron_esmvalbot_test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ on:
44
# push:
55
# branches:
66
# - cron_esmvalbot_test
7-
# scheduled once every 2 weeks
7+
# scheduled twice a month (on the 1st and 16th)
88
schedule:
9-
- cron: '0 4 */14 * *'
9+
- cron: '0 4 1,16 * *'
1010

1111
# Required shell entrypoint to have properly configured bash shell
1212
defaults:
@@ -16,6 +16,7 @@ defaults:
1616
jobs:
1717
run-esmvalbot:
1818
runs-on: 'ubuntu-latest'
19+
if: github.repository == 'ESMValGroup/ESMValTool' # avoid GAs in forks
1920
steps:
2021
- uses: actions/checkout@v4
2122
with:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ defaults:
1717
jobs:
1818
linux:
1919
runs-on: "ubuntu-latest"
20+
if: github.repository == 'ESMValGroup/ESMValTool' # avoid GAs in forks
2021
strategy:
2122
fail-fast: false
2223
matrix:
@@ -53,6 +54,7 @@ jobs:
5354
#
5455
# osx:
5556
# runs-on: "macos-latest"
57+
# if: github.repository == 'ESMValGroup/ESMValTool' # avoid GAs in forks
5658
# strategy:
5759
# matrix:
5860
# python-version: ["3.10", "3.11"]

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ defaults:
2828
jobs:
2929
linux:
3030
runs-on: "ubuntu-latest"
31+
if: github.repository == 'ESMValGroup/ESMValTool' # avoid GAs in forks
3132
strategy:
3233
matrix:
3334
python-version: ["3.10", "3.11", "3.12"]
@@ -53,7 +54,7 @@ jobs:
5354
- run: pip install -e .[develop]
5455
- run: esmvaltool --help
5556
- run: esmvaltool version 2>&1 | tee source_install_linux_artifacts_python_${{ matrix.python-version }}/version.txt
56-
- run: flake8
57+
- run: pre-commit run -a
5758
- run: pytest -n 2 -m "not installation"
5859
- name: Upload artifacts
5960
if: ${{ always() }} # upload artifacts even if fail

0 commit comments

Comments
 (0)