Skip to content

Commit e731b2e

Browse files
Merge branch 'main' into intake-esm
2 parents ce4b2eb + 28e17b8 commit e731b2e

232 files changed

Lines changed: 4982 additions & 1571 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.

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,7 @@ updates:
1414
interval: "weekly"
1515
cooldown:
1616
default-days: 7
17+
labels:
18+
- dependencies
19+
- github_actions
20+
- automatedPR
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
doc/contributing.rst

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Build a binary wheel and a source tarball
3636
run: python3 -m build
3737
- name: Store the distribution packages
38-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
38+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
3939
with:
4040
name: python-package-distributions
4141
path: dist/
@@ -55,7 +55,7 @@ jobs:
5555

5656
steps:
5757
- name: Download all the dists
58-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
58+
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
5959
with:
6060
name: python-package-distributions
6161
path: dist/

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
esmvaltool version 2>&1 | tee conda_install_linux_artifacts_python_${{ matrix.python-version }}/version.txt
6969
- name: Upload artifacts
7070
if: ${{ always() }} # upload artifacts even if fail
71-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
71+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
7272
with:
7373
name: Conda_Install_Linux_python_${{ matrix.python-version }}
7474
path: conda_install_linux_artifacts_python_${{ matrix.python-version }}
@@ -104,7 +104,7 @@ jobs:
104104
esmvaltool version 2>&1 | tee conda_install_osx_artifacts_python_${{ matrix.python-version }}/version.txt
105105
- name: Upload artifacts
106106
if: ${{ always() }} # upload artifacts even if fail
107-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
107+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
108108
with:
109109
name: Conda_Install_OSX_python_${{ matrix.python-version }}
110110
path: conda_install_osx_artifacts_python_${{ matrix.python-version }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
- run: pytest -n 2 -m "not installation"
6161
- name: Upload artifacts
6262
if: ${{ always() }} # upload artifacts even if fail
63-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
63+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
6464
with:
6565
name: Source_Install_Linux_python_${{ matrix.python-version }}
6666
path: source_install_linux_artifacts_python_${{ matrix.python-version }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
esmvaltool version 2>&1 | tee pip_install_linux_artifacts_python_${{ matrix.python-version }}/version.txt
7474
- name: Upload artifacts
7575
if: ${{ always() }} # upload artifacts even if fail
76-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
76+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
7777
with:
7878
name: PIP_Install_Linux_python_${{ matrix.python-version }}
7979
path: pip_install_linux_artifacts_python_${{ matrix.python-version }}
@@ -113,7 +113,7 @@ jobs:
113113
esmvaltool version 2>&1 | tee pip_install_osx_artifacts_python_${{ matrix.python-version }}/version.txt
114114
- name: Upload artifacts
115115
if: ${{ always() }} # upload artifacts even if fail
116-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
116+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
117117
with:
118118
name: PIP_Install_OSX_python_${{ matrix.python-version }}
119119
path: pip_install_osx_artifacts_python_${{ matrix.python-version }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
esmvaltool version 2>&1 | tee source_install_linux_artifacts_python_${{ matrix.python-version }}/version.txt
7070
- name: Upload artifacts
7171
if: ${{ always() }} # upload artifacts even if fail
72-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
72+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
7373
with:
7474
name: Source_Install_Linux_python_${{ matrix.python-version }}
7575
path: source_install_linux_artifacts_python_${{ matrix.python-version }}
@@ -111,7 +111,7 @@ jobs:
111111
esmvaltool version 2>&1 | tee source_install_osx_artifacts_python_${{ matrix.python-version }}/version.txt
112112
- name: Upload artifacts
113113
if: ${{ always() }} # upload artifacts even if fail
114-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
114+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
115115
with:
116116
name: Source_Install_OSX_python_${{ matrix.python-version }}
117117
path: source_install_osx_artifacts_python_${{ matrix.python-version }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- run: python tests/parse_pymon.py
5151
- name: Upload artifacts
5252
if: ${{ always() }} # upload artifacts even if fail
53-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
53+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
5454
with:
5555
name: Test_Linux_python_${{ matrix.python-version }}
5656
path: test_linux_artifacts_python_${{ matrix.python-version }}
@@ -88,7 +88,7 @@ jobs:
8888
- run: python tests/parse_pymon.py
8989
- name: Upload artifacts
9090
if: ${{ always() }} # upload artifacts even if fail
91-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
91+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
9292
with:
9393
name: Test_OSX_python_${{ matrix.python-version }}
9494
path: test_osx_artifacts_python_${{ matrix.python-version }}

.github/workflows/run-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
- run: pytest -n 2 -m "not installation" 2>&1 | tee test_linux_artifacts_python_${{ matrix.python-version }}/test_report.txt
7171
- name: Upload artifacts
7272
if: ${{ always() }} # upload artifacts even if fail
73-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
73+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
7474
with:
7575
name: Test_Linux_python_${{ matrix.python-version }}
7676
path: test_linux_artifacts_python_${{ matrix.python-version }}
@@ -110,7 +110,7 @@ jobs:
110110
- run: pytest -n 2 -m "not installation" 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/test_report.txt
111111
- name: Upload artifacts
112112
if: ${{ always() }} # upload artifacts even if fail
113-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
113+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
114114
with:
115115
name: Test_OSX_python_${{ matrix.python-version }}
116116
path: test_osx_artifacts_python_${{ matrix.python-version }}

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
pull-requests: write
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
19+
- uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
2020
with:
2121
days-before-issue-stale: 720
2222
days-before-pr-stale: 180

0 commit comments

Comments
 (0)