Skip to content

Commit bbe4ba0

Browse files
jlenhjlenh
authored
Merge branch 'main' into surface_trace_gases_noaa_gml
2 parents 6a5c16e + 26d8c28 commit bbe4ba0

File tree

75 files changed

+4455
-460
lines changed

Some content is hidden

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

75 files changed

+4455
-460
lines changed

‎.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.

‎.pre-commit-config.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
---
44
exclude: |
55
(?x)
6+
^archive|
67
^doc/sphinx/source/conf.py|
78
^esmvaltool/diag_scripts/extreme_events/climdex.pcic.ncdf/|
89
^esmvaltool/diag_scripts/cvdp/|
@@ -20,7 +21,7 @@ repos:
2021
- id: trailing-whitespace
2122
args: [--markdown-linebreak-ext=md]
2223
- repo: https://github.com/astral-sh/ruff-pre-commit
23-
rev: "v0.9.3"
24+
rev: "v0.12.2"
2425
hooks:
2526
- id: ruff
2627
args:

‎.zenodo.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,11 @@
8585
"affiliation": "Met Office, UK",
8686
"name": "Billows, Chris"
8787
},
88+
{
89+
"affiliation": "Met Office, UK",
90+
"name": "Blockley, Ed",
91+
"orcid": "0000-0002-0489-4238"
92+
},
8893
{
8994
"affiliation": "DLR, Germany",
9095
"name": "Bock, Lisa",
@@ -286,6 +291,10 @@
286291
"affiliation": "University of Arizona, USA",
287292
"name": "Amarjiit, Pandde"
288293
},
294+
{
295+
"affiliation": "Met Office, UK",
296+
"name": "Parsons, Naomi"
297+
},
289298
{
290299
"affiliation": "BSC, Spain",
291300
"name": "Pérez-Zanón, Núria"

‎CITATION.cff

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ authors:
8989
affiliation: "Met Office, UK"
9090
family-names: Billows
9191
given-names: Chris
92+
-
93+
affiliation: "Met Office, UK"
94+
family-names: Blockley
95+
given-names: Ed
96+
orcid: "https://orcid.org/0000-0002-0489-4238"
9297
-
9398
affiliation: "DLR, Germany"
9499
family-names: Bock
@@ -287,6 +292,10 @@ authors:
287292
affiliation: "University of Arizona, USA"
288293
family-names: Amarjiit
289294
given-names: Pandde
295+
-
296+
affiliation: "Met Office, UK"
297+
family-names: Parsons
298+
given-names: Naomi
290299
-
291300
affiliation: "BSC, Spain"
292301
family-names: Pérez-Zanón

‎conda-linux-64.lock

Lines changed: 103 additions & 105 deletions
Large diffs are not rendered by default.

‎doc/sphinx/source/api/esmvaltool.diag_scripts.lifetime.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
.. _api.esmvaltool.diag_scripts.lifetime.lifetime:
2+
3+
Calculating and displaying multiple representations of the CH4 lifetime
4+
=======================================================================
5+
6+
7+
.. automodule:: esmvaltool.diag_scripts.lifetime.lifetime
8+
:no-members:
9+
:no-inherited-members:
10+
:no-show-inheritance:

‎doc/sphinx/source/api/esmvaltool.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Diagnostic Scripts
2525

2626
esmvaltool.diag_scripts.droughts
2727
esmvaltool.diag_scripts.emergent_constraints
28+
esmvaltool.diag_scripts.lifetime
2829
esmvaltool.diag_scripts.monitor
2930
esmvaltool.diag_scripts.ocean
3031
esmvaltool.diag_scripts.seaborn_diag

‎doc/sphinx/source/input.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,8 @@ A list of the datasets for which a CMORizers is available is provided in the fol
311311
+------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+
312312
| ESACCI-AEROSOL | abs550aer, od550aer, od550aerStderr, od550lt1aer, od870aer, od870aerStderr (aero) | 2 | NCL |
313313
+------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+
314-
| ESACCI-CLOUD | clivi, clt, cltStderr, clwvi, lwp, rlut, rlutcs, rsut, rsutcs, rsdt, rlus, rsus, rsuscs (Amon) | 2 | NCL |
314+
| ESACCI-CLOUD | clivi, clt, cltStderr, clwvi, lwp, rlut, rlutcs, rsut, rsutcs, rsdt, rlus, rsus, rsuscs (Amon), | 2 | Python |
315+
| | clt, clwvi, cod (day) | 2 | |
315316
+------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+
316317
| ESACCI-FIRE | burntArea (Lmon) | 2 | NCL |
317318
+------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+
@@ -361,6 +362,8 @@ A list of the datasets for which a CMORizers is available is provided in the fol
361362
+------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+
362363
| GLODAP | dissic, ph, talk (Oyr) | 2 | Python |
363364
+------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+
365+
| GLWD | wetlandFrac (Emon) | 2 | Python |
366+
+------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+
364367
| GPCC | pr (Amon) | 2 | Python |
365368
+------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+
366369
| GPCP-SG | pr (Amon) | 2 | Python |
@@ -479,6 +482,8 @@ A list of the datasets for which a CMORizers is available is provided in the fol
479482
+------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+
480483
| UWisc* [#t3]_ | clwvi, lwpStderr (Amon) | 3 | NCL |
481484
+------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+
485+
| WAD2M | wetlandFrac (Emon) | 2 | Python |
486+
+------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+
482487
| WFDE5 | tas, pr (Amon, day) | 2 | Python |
483488
+------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+
484489
| WOA | thetao, so, tos, sos (Omon) | 2 | Python |

‎doc/sphinx/source/recipes/figures/lifetime/timeseries_ambiguous_dataset_ch4_TROP.png

106 KB
Loading

‎doc/sphinx/source/recipes/figures/ref/timeseries_tas_ambiguous_dataset_Amon_historical_r1i1p1f1.png

239 KB
Loading

0 commit comments

Comments
 (0)