Skip to content

Commit fcbcfdb

Browse files
huardhuard
committed
merge
2 parents ee6b6aa + a4a0724 commit fcbcfdb

File tree

121 files changed

+2487
-2778
lines changed

Some content is hidden

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

121 files changed

+2487
-2778
lines changed

‎.cruft.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"template": "https://github.com/Ouranosinc/cookiecutter-pypackage",
3-
"commit": "2b31b0f76a180ad93e5a49fe5744306fefb48c9c",
3+
"commit": "a58a1f8dfd7610c4f0e7517c68fcd7c60279f5a8",
44
"context": {
55
"cookiecutter": {
66
"full_name": "David Huard",
@@ -10,11 +10,10 @@
1010
"project_slug": "ravenpy",
1111
"project_short_description": "A Python wrapper to setup and run the hydrologic modelling framework Raven.",
1212
"pypi_username": "CSHS-CWRA",
13-
"version": "0.18.3-dev.1",
13+
"version": "0.19.1",
1414
"use_pytest": "y",
1515
"use_black": "y",
1616
"use_conda": "y",
17-
"add_pyup_badge": "n",
1817
"make_docs": "y",
1918
"add_translations": "y",
2019
"command_line_interface": "Click",
@@ -23,7 +22,7 @@
2322
"generated_with_cruft": "y",
2423
"__gh_slug": "https://github.com/CSHS-CWRA/RavenPy",
2524
"_template": "https://github.com/Ouranosinc/cookiecutter-pypackage",
26-
"_commit": "2b31b0f76a180ad93e5a49fe5744306fefb48c9c"
25+
"_commit": "a58a1f8dfd7610c4f0e7517c68fcd7c60279f5a8"
2726
}
2827
},
2928
"directory": null,

‎.flake8‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ ignore =
1717
D,
1818
E,
1919
F,
20+
RST210,
2021
W503
2122
per-file-ignores =
2223
rst-roles =

‎.github/dependabot.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ updates:
88
- package-ecosystem: github-actions
99
directory: .github/workflows
1010
schedule:
11-
interval: monthly
11+
interval: "quarterly"
1212
groups:
1313
actions:
1414
patterns:
@@ -17,7 +17,7 @@ updates:
1717
- package-ecosystem: pip
1818
directory: /
1919
schedule:
20-
interval: monthly
20+
interval: "quarterly"
2121
groups:
2222
ci:
2323
patterns:

‎.github/workflows/bump-version.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ on:
1919
- .zenodo.json
2020
- AUTHORS.rst
2121
- CHANGELOG.rst
22-
- CI/**/*.in
23-
- CI/**/*.py
24-
- CI/**/*.txt
22+
- CI/**.in
23+
- CI/**.txt
2524
- CODE_OF_CONDUCT.md
2625
- CONTRIBUTING.rst
2726
- Makefile
2827
- .readthedocs.yml
2928
- docs/*.py
30-
- docs/*.rst
29+
- docs/**.rst
30+
- docs/notebooks/**.ipynb
3131
- environment-docs.yml
3232
- environment-dev.yml
3333
- pyproject.toml
@@ -47,30 +47,35 @@ jobs:
4747
contents: write
4848
steps:
4949
- name: Harden Runner
50-
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
50+
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
5151
with:
5252
disable-sudo: true
5353
egress-policy: block
5454
allowed-endpoints: >
5555
files.pythonhosted.org:443
5656
github.com:443
5757
pypi.org:443
58+
5859
- name: Checkout Repository (no persist-credentials)
5960
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6061
with:
6162
persist-credentials: false
6263
fetch-depth: 0
64+
6365
- name: Set up Python3
6466
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
6567
with:
6668
python-version: "3.x"
69+
6770
- name: Config Commit Bot
6871
run: |
6972
git config --local user.email "bumpversion[bot]@ouranos.ca"
7073
git config --local user.name "bumpversion[bot]"
74+
7175
- name: Install CI libraries
7276
run: |
7377
python -m pip install --require-hashes -r CI/requirements_ci.txt
78+
7479
- name: Conditional Bump Version
7580
run: |
7681
CURRENT_VERSION=$(bump-my-version show current_version)
@@ -82,6 +87,7 @@ jobs:
8287
bump-my-version bump patch
8388
fi
8489
echo "new_version=$(bump-my-version show current_version)"
90+
8591
- name: Push Changes
8692
uses: ad-m/github-push-action@d91a481090679876dfc4178fef17f286781251df # v0.8.0
8793
with:

‎.github/workflows/cache-cleaner.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ jobs:
1616
actions: write
1717
steps:
1818
- name: Harden Runner
19-
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
19+
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
2020
with:
2121
disable-sudo: true
2222
egress-policy: block
2323
allowed-endpoints: >
2424
api.github.com:443
2525
github.com:443
2626
objects.githubusercontent.com:443
27+
release-assets.githubusercontent.com:443
2728
2829
- name: Checkout Repository
2930
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
5454
steps:
5555
- name: Harden Runner
56-
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
56+
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
5757
with:
5858
disable-sudo: true
5959
egress-policy: audit
@@ -65,7 +65,7 @@ jobs:
6565

6666
# Initializes the CodeQL tools for scanning.
6767
- name: Initialize CodeQL
68-
uses: github/codeql-action/init@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
68+
uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
6969
with:
7070
languages: ${{ matrix.language }}
7171
build-mode: ${{ matrix.build-mode }}
@@ -94,6 +94,6 @@ jobs:
9494
exit 1
9595
9696
- name: Perform CodeQL Analysis
97-
uses: github/codeql-action/analyze@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
97+
uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
9898
with:
9999
category: "/language:${{matrix.language}}"

‎.github/workflows/dependency-review.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Harden Runner
20-
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
20+
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
2121
with:
2222
disable-sudo: true
2323
egress-policy: block

‎.github/workflows/first-pull-request.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
steps:
1818
- name: Harden Runner
19-
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
19+
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
2020
with:
2121
disable-sudo: true
2222
egress-policy: block

‎.github/workflows/label.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
pull-requests: write
2424
steps:
2525
- name: Harden Runner
26-
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
26+
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
2727
with:
2828
disable-sudo: true
2929
egress-policy: block

‎.github/workflows/main.yml‎

Lines changed: 51 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
pull_request:
88

99
env:
10-
RAVEN_TESTING_DATA_BRANCH: master
10+
RAVEN_TESTDATA_BRANCH: v2025.6.12
1111

1212
concurrency:
1313
group: ${{ github.workflow }}-${{ github.ref }}
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Harden Runner
25-
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
25+
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
2626
with:
2727
disable-sudo: true
2828
egress-policy: block
@@ -68,29 +68,14 @@ jobs:
6868
tox-env: 'py3.10-coverage-upstream'
6969
steps:
7070
- name: Harden Runner
71-
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
71+
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
7272
with:
73-
egress-policy: block
74-
allowed-endpoints: >
75-
api.github.com:443
76-
azure.archive.ubuntu.com:80
77-
coveralls.io:443
78-
esm.ubuntu.com:443
79-
files.pythonhosted.org:443
80-
github.com:443
81-
motd.ubuntu.com:443
82-
objects.githubusercontent.com:443
83-
packages.microsoft.com:443
84-
pavics.ouranos.ca:443
85-
pypi.org:443
86-
raw.githubusercontent.com:443
87-
test.opendap.org:80
88-
73+
disable-sudo: false
74+
egress-policy: audit
8975
- name: Checkout Repository
9076
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
9177
with:
9278
persist-credentials: false
93-
9479
- name: Set up Python${{ matrix.python-version }}
9580
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
9681
with:
@@ -117,14 +102,32 @@ jobs:
117102
- name: Install CI libraries
118103
run: |
119104
python3 -m pip install --require-hashes -r CI/requirements_ci.txt
105+
106+
- name: Environment caching (macOS)
107+
if: matrix.os == 'macos-latest'
108+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
109+
with:
110+
path: |
111+
.tox
112+
~/Library/Caches/raven-testdata
113+
key: ${{ hashFiles('src/ravenpy/testing/registry.txt') }}-${{ env.RAVEN_TESTDATA_BRANCH }}-${{ matrix.os }}
114+
- name: Environment caching (Ubuntu)
115+
if: matrix.os == 'ubuntu-latest'
116+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
117+
with:
118+
path: |
119+
.tox
120+
~/.cache/raven-testdata
121+
key: ${{ hashFiles('src/ravenpy/testing/registry.txt') }}-${{ env.RAVEN_TESTDATA_BRANCH }}-${{ matrix.os }}
122+
120123
- name: Test with tox and report coverage
121124
run: |
122125
if [ "${{ matrix.tox-env }}" != "false" ]; then
123-
python3 -m tox -e ${{ matrix.tox-env }}
126+
python3 -m tox -e ${{ matrix.tox-env }}-prefetch
124127
elif [ "${{ matrix.python-version }}" != "3.13" ]; then
125-
python3 -m tox -e py${{ matrix.python-version }}-coverage
128+
python3 -m tox -e py${{ matrix.python-version }}-prefetch-coverage
126129
else
127-
python3 -m tox -e py${{ matrix.python-version }}
130+
python3 -m tox -e py${{ matrix.python-version }}-prefetch
128131
fi
129132
env:
130133
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -148,21 +151,10 @@ jobs:
148151
shell: bash -l {0}
149152
steps:
150153
- name: Harden Runner
151-
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
154+
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
152155
with:
153156
disable-sudo: true
154-
egress-policy: block
155-
allowed-endpoints: >
156-
api.github.com:443
157-
conda.anaconda.org:443
158-
coveralls.io:443
159-
files.pythonhosted.org:443
160-
github.com:443
161-
objects.githubusercontent.com:443
162-
pavics.ouranos.ca:443
163-
pypi.org:443
164-
raw.githubusercontent.com:443
165-
test.opendap.org:80
157+
egress-policy: audit
166158
- name: Checkout Repository
167159
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
168160
with:
@@ -172,7 +164,7 @@ jobs:
172164
run: |
173165
sed -i 's/climpred >=2.4.0/xesmf/' environment.yml
174166
- name: Setup Conda (Micromamba) with Python${{ matrix.python-version }}
175-
uses: mamba-org/setup-micromamba@0dea6379afdaffa5d528b3d1dabc45da37f443fc # v2.0.4
167+
uses: mamba-org/setup-micromamba@b09ef9b599704322748535812ca03efb2625677b # v2.0.5
176168
with:
177169
cache-downloads: true
178170
cache-environment: true
@@ -187,13 +179,32 @@ jobs:
187179
run: |
188180
micromamba list
189181
python -m pip check || true
182+
- name: Cache test data (macOS)
183+
if: matrix.os == 'macos-latest'
184+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
185+
with:
186+
path: |
187+
~/Library/Caches/raven-testdata
188+
key: ${{ hashFiles('src/ravenpy/testing/registry.txt') }}-${{ env.RAVEN_TESTDATA_BRANCH }}-conda-${{ matrix.os }}
189+
- name: Cache test data (Ubuntu)
190+
if: matrix.os == 'ubuntu-latest'
191+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
192+
with:
193+
path: |
194+
~/.cache/raven-testdata
195+
key: ${{ hashFiles('src/ravenpy/testing/registry.txt') }}-${{ env.RAVEN_TESTDATA_BRANCH }}-conda-${{ matrix.os }}
196+
197+
- name: Prefetch RavenPy test data
198+
run: |
199+
python -c "import ravenpy.testing.utils as rtu; rtu.populate_testing_data()"
200+
190201
- name: Test RavenPy
191202
run: |
192203
python -m pytest --numprocesses=logical --cov=src/ravenpy --cov-report=lcov
193204
- name: Report Coverage
194205
uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b # v2.3.6
195206
with:
196-
flag-name: run-conda_${{ matrix.python-version }}_${{ matrix.os }}
207+
flag-name: run-${{ matrix.python-version }}-${{ matrix.os }}-conda
197208
parallel: true
198209

199210
finish:
@@ -204,14 +215,10 @@ jobs:
204215
runs-on: ubuntu-latest
205216
steps:
206217
- name: Harden Runner
207-
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
218+
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
208219
with:
209220
disable-sudo: true
210-
egress-policy: block
211-
allowed-endpoints: >
212-
coveralls.io:443
213-
github.com:443
214-
objects.githubusercontent.com:443
221+
egress-policy: audit
215222
- name: Coveralls Finished
216223
uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b # v2.3.6
217224
with:

0 commit comments

Comments
 (0)