Skip to content

Commit 716994b

Browse files
authored
[pre-commit.ci] pre-commit autoupdate (#549)
<!--pre-commit.ci start--> updates: - [github.com/asottile/pyupgrade: v3.20.0 → v3.21.0](asottile/pyupgrade@v3.20.0...v3.21.0) - [github.com/astral-sh/ruff-pre-commit: v0.13.3 → v0.14.3](astral-sh/ruff-pre-commit@v0.13.3...v0.14.3) - [github.com/python-jsonschema/check-jsonschema: 0.34.0 → 0.34.1](python-jsonschema/check-jsonschema@0.34.0...0.34.1) - [github.com/woodruffw/zizmor-pre-commit: v1.14.2 → v1.16.2](zizmorcore/zizmor-pre-commit@v1.14.2...v1.16.2) <!--pre-commit.ci end-->
2 parents 8bba516 + ab76cb5 commit 716994b

File tree

11 files changed

+115
-120
lines changed

11 files changed

+115
-120
lines changed

.cruft.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"template": "https://github.com/Ouranosinc/cookiecutter-pypackage",
3-
"commit": "66708e5e15f00caaaaf1748bf0a7e041bc5c6243",
3+
"commit": "273d570f627b0ac0fb07c2457f0072e492bff6d7",
44
"context": {
55
"cookiecutter": {
66
"full_name": "David Huard",
@@ -22,7 +22,7 @@
2222
"generated_with_cruft": "y",
2323
"__gh_slug": "https://github.com/CSHS-CWRA/RavenPy",
2424
"_template": "https://github.com/Ouranosinc/cookiecutter-pypackage",
25-
"_commit": "66708e5e15f00caaaaf1748bf0a7e041bc5c6243"
25+
"_commit": "273d570f627b0ac0fb07c2457f0072e492bff6d7"
2626
}
2727
},
2828
"directory": null,

.github/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
- '.yamllint.yml'
1919
- '.github/workflows/*'
2020
- 'docs/Makefile'
21-
- 'tox.ini'
21+
- 'tox.toml'
2222
- 'CI/**/*'
2323
- 'Makefile'
2424
# label 'docs' all documentation-related steps and files

.github/workflows/bump-version.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ on:
3232
- environment-dev.yml
3333
- pyproject.toml
3434
- tests/**.py
35-
- tox.ini
35+
- tox.toml
3636
- src/ravenpy/__init__.py
3737
workflow_dispatch:
3838

@@ -45,6 +45,9 @@ jobs:
4545
permissions:
4646
actions: read
4747
contents: write
48+
strategy:
49+
matrix:
50+
python-version: [ "3.13" ]
4851
steps:
4952
- name: Harden Runner
5053
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
@@ -65,7 +68,7 @@ jobs:
6568
- name: Set up Python3
6669
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
6770
with:
68-
python-version: "3.x"
71+
python-version: ${{ matrix.python-version }}
6972

7073
- name: Config Commit Bot
7174
run: |

.github/workflows/main.yml

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ jobs:
2020
lint:
2121
name: Code linting
2222
runs-on: ubuntu-latest
23+
strategy:
24+
matrix:
25+
python-version: [ "3.13" ]
2326
steps:
2427
- name: Harden Runner
2528
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
@@ -37,7 +40,7 @@ jobs:
3740
- name: Set up Python${{ matrix.python-version }}
3841
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
3942
with:
40-
python-version: "3.x"
43+
python-version: ${{ matrix.python-version }}
4144
cache: pip
4245
- name: Install CI libraries
4346
run: |
@@ -47,7 +50,7 @@ jobs:
4750
with:
4851
path: |
4952
.tox
50-
key: ${{ hashFiles('pyproject.toml', 'tox.ini') }}-lint
53+
key: ${{ hashFiles('pyproject.toml', 'tox.toml') }}-lint
5154
- name: Run linting suite
5255
run: |
5356
python -m tox -e lint
@@ -61,11 +64,9 @@ jobs:
6164
matrix:
6265
os: [ 'ubuntu-latest', "macos-latest" ]
6366
python-version: [ "3.11", "3.12", "3.13" ]
64-
tox-env: [ 'false' ]
6567
include:
6668
- os: 'ubuntu-latest'
6769
python-version: '3.10'
68-
tox-env: 'py3.10-coverage-upstream'
6970
steps:
7071
- name: Harden Runner
7172
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
@@ -82,17 +83,17 @@ jobs:
8283
python-version: ${{ matrix.python-version }}
8384
cache: pip
8485

85-
- name: Install GDAL + Set GDAL_VERSION (Ubuntu)
86+
- name: Install GDAL/HDF5 + Set GDAL_VERSION (Ubuntu)
8687
if: matrix.os == 'ubuntu-latest'
8788
run: |
8889
sudo apt-get update
89-
sudo apt-get install libgdal-dev
90+
sudo apt-get install libgdal-dev libhdf5-dev
9091
echo "GDAL_VERSION=$(gdal-config --version)" >> $GITHUB_ENV
91-
- name: Install GDAL (macOS)
92+
- name: Install GDAL/HDF5 (macOS)
9293
if: matrix.os == 'macos-latest'
9394
uses: tecolicom/actions-use-homebrew-tools@b9c066b79607fa3d71e0be05d7003bb75fd9ff34 # v1.3
9495
with:
95-
tools: gdal
96+
tools: gdal hdf5
9697
cache: "yes"
9798
- name: Set GDAL_VERSION (macOS)
9899
if: matrix.os == 'macos-latest'
@@ -120,22 +121,19 @@ jobs:
120121
~/.cache/raven-testdata
121122
key: ${{ hashFiles('src/ravenpy/testing/registry.txt') }}-${{ env.RAVEN_TESTDATA_BRANCH }}-${{ matrix.os }}
122123

123-
- name: Test with tox and report coverage
124+
- name: Test with tox
124125
run: |
125-
if [ "${{ matrix.tox-env }}" != "false" ]; then
126-
python3 -m tox -e ${{ matrix.tox-env }}-prefetch
127-
elif [ "${{ matrix.python-version }}" != "3.13" ]; then
128-
python3 -m tox -e py${{ matrix.python-version }}-prefetch-coverage
129-
else
130-
python3 -m tox -e py${{ matrix.python-version }}-prefetch
131-
fi
126+
python3 -m tox
132127
env:
133-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
134-
COVERALLS_FLAG_NAME: run-Python${{ matrix.python-version }}-${{ matrix.os }}
135-
COVERALLS_PARALLEL: true
136-
COVERALLS_SERVICE_NAME: github
128+
TOX_GH_MAJOR_MINOR: ${{ matrix.python-version }}
137129
UPSTREAM_BRANCH: ${{ matrix.upstream-branch }}
138130

131+
- name: Report Coverage
132+
uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b # v2.3.6
133+
with:
134+
flag-name: run-${{ matrix.python-version }}-${{ matrix.os }}-pypi
135+
parallel: true
136+
139137
conda:
140138
name: Test with Python${{ matrix.python-version }} (Anaconda, ${{ matrix.os }})
141139
needs: lint

.github/workflows/publish-pypi.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ jobs:
1616
# IMPORTANT: this permission is mandatory for trusted publishing
1717
id-token: write
1818
runs-on: ubuntu-latest
19+
strategy:
20+
matrix:
21+
python-version: [ "3.13" ]
1922
steps:
2023
- name: Harden Runner
2124
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
@@ -35,10 +38,10 @@ jobs:
3538
with:
3639
persist-credentials: false
3740

38-
- name: Set up Python3
41+
- name: Set up Python${{ matrix.python-version }}
3942
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
4043
with:
41-
python-version: "3.x"
44+
python-version: ${{ matrix.python-version }}
4245

4346
- name: Install CI libraries
4447
run: |

.github/workflows/tag-testpypi.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ jobs:
4444
# IMPORTANT: this permission is mandatory for trusted publishing
4545
id-token: write
4646
runs-on: ubuntu-latest
47+
strategy:
48+
matrix:
49+
python-version: [ "3.13" ]
4750
steps:
4851
- name: Harden Runner
4952
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
@@ -63,10 +66,10 @@ jobs:
6366
with:
6467
persist-credentials: false
6568

66-
- name: Set up Python3
69+
- name: Set up Python${{ matrix.python-version }}
6770
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
6871
with:
69-
python-version: "3.x"
72+
python-version: ${{ matrix.python-version }}
7073

7174
- name: Install CI libraries
7275
run: |

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ default_language_version:
33

44
repos:
55
- repo: https://github.com/asottile/pyupgrade
6-
rev: v3.20.0
6+
rev: v3.21.0
77
hooks:
88
- id: pyupgrade
99
args: [ '--py39-plus' ]
@@ -49,7 +49,7 @@ repos:
4949
- id: rst-inline-touching-normal
5050
- id: text-unicode-replacement-char
5151
- repo: https://github.com/astral-sh/ruff-pre-commit
52-
rev: v0.13.3
52+
rev: v0.14.3
5353
hooks:
5454
- id: ruff-check
5555
args: [ '--fix', '--show-fixes' ]
@@ -58,7 +58,7 @@ repos:
5858
rev: 7.3.0
5959
hooks:
6060
- id: flake8
61-
additional_dependencies: [ 'flake8-rst-docstrings==0.3.1' ]
61+
additional_dependencies: [ 'flake8-rst-docstrings==0.4.0' ]
6262
args: [ '--config=.flake8' ]
6363
- repo: https://github.com/jendrikseipp/vulture
6464
rev: v2.14
@@ -92,12 +92,12 @@ repos:
9292
- id: numpydoc-validation
9393
exclude: "^docs/|^tests/"
9494
- repo: https://github.com/python-jsonschema/check-jsonschema
95-
rev: 0.34.0
95+
rev: 0.34.1
9696
hooks:
9797
- id: check-github-workflows
9898
- id: check-readthedocs
9999
- repo: https://github.com/woodruffw/zizmor-pre-commit
100-
rev: v1.14.2
100+
rev: v1.16.2
101101
hooks:
102102
- id: zizmor
103103
args: [ '--config=.zizmor.yml' ]

pyproject.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ dev = [
6969
"coverage >=7.5.0",
7070
"filelock >=3.14.0",
7171
"flake8 >=7.3.0",
72-
"flake8-rst-docstrings >=0.3.1",
72+
"flake8-rst-docstrings >=0.4.0",
7373
"flit >=3.11.0,<4.0",
7474
"holoviews",
7575
"hvplot",
@@ -83,7 +83,8 @@ dev = [
8383
"pytest >=8.3.2",
8484
"pytest-cov >=5.0.0",
8585
"pytest-xdist >=3.2.0",
86-
"ruff >=0.13.3",
86+
"requests >=2.32.2",
87+
"ruff >=0.14.3",
8788
"tox >=4.30.3",
8889
"vulture >=2.14",
8990
"watchdog >=4.0.0"
@@ -277,7 +278,7 @@ include = [
277278
"setup.cfg",
278279
"tests/*.py",
279280
"tests/test.cfg",
280-
"tox.ini"
281+
"tox.toml"
281282
]
282283
exclude = [
283284
"**/*.py[co]",

tests/test_geoserver.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import numpy as np
77
import pytest
8+
from requests.exceptions import HTTPError
89

910

1011
@pytest.mark.online
@@ -152,7 +153,9 @@ def test_get_feature_attributes_wfs(self):
152153
assert gdf.STATE_NAME.unique() == "Nevada"
153154

154155

156+
# FIXME: Something strange is going on with GitHub Actions and PAVICS Geoserver access. Investigate.
155157
@pytest.mark.online
158+
@pytest.mark.xfail(HTTPError, reason="Geoserver WCS seems to be inaccessible from GitHub.", strict=False)
156159
class TestWCS:
157160
io = pytest.importorskip("ravenpy.utilities.io")
158161
geoserver = pytest.importorskip("ravenpy.utilities.geoserver")

tox.ini

Lines changed: 0 additions & 83 deletions
This file was deleted.

0 commit comments

Comments
 (0)