Skip to content

Commit 1771f13

Browse files
committed
Merge branch 'main' into fix-type-check
2 parents 61fa69b + e7e0d70 commit 1771f13

File tree

5 files changed

+19
-24
lines changed

5 files changed

+19
-24
lines changed

.cruft.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"template": "https://github.com/ecmwf-projects/cookiecutter-conda-package",
3-
"commit": "8a346c4ecd7ada4447ab9c224fe3a8b17a79f540",
3+
"commit": "429e173a60bbf888e48d1987797aeac5ad840c47",
44
"checkout": null,
55
"context": {
66
"cookiecutter": {

.github/workflows/on-push.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
pre-commit:
2323
runs-on: ubuntu-latest
2424
steps:
25-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
2626
- uses: actions/setup-python@v4
2727
with:
2828
python-version: 3.x
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333

3434
steps:
35-
- uses: actions/checkout@v3
35+
- uses: actions/checkout@v4
3636
- name: Install conda-merge
3737
run: |
3838
$CONDA/bin/python -m pip install conda-merge
@@ -56,7 +56,7 @@ jobs:
5656
python-version: ['3.10', '3.11']
5757

5858
steps:
59-
- uses: actions/checkout@v3
59+
- uses: actions/checkout@v4
6060
- name: Download combined environments
6161
uses: actions/download-artifact@v3
6262
with:
@@ -82,7 +82,7 @@ jobs:
8282
runs-on: ubuntu-latest
8383

8484
steps:
85-
- uses: actions/checkout@v3
85+
- uses: actions/checkout@v4
8686
- name: Download combined environments
8787
uses: actions/download-artifact@v3
8888
with:
@@ -108,7 +108,7 @@ jobs:
108108
runs-on: ubuntu-latest
109109

110110
steps:
111-
- uses: actions/checkout@v3
111+
- uses: actions/checkout@v4
112112
- name: Download combined environments
113113
uses: actions/download-artifact@v3
114114
with:
@@ -144,7 +144,7 @@ jobs:
144144
extra: -integration
145145

146146
steps:
147-
- uses: actions/checkout@v3
147+
- uses: actions/checkout@v4
148148
- name: Download combined environments
149149
uses: actions/download-artifact@v3
150150
with:
@@ -176,7 +176,7 @@ jobs:
176176
(needs.integration-tests.result == 'success' || needs.integration-tests.result == 'skipped')
177177
178178
steps:
179-
- uses: actions/checkout@v3
179+
- uses: actions/checkout@v4
180180
- name: Install packages
181181
run: |
182182
$CONDA/bin/python -m pip install build twine

.pre-commit-config.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ repos:
1111
- id: debug-statements
1212
- id: mixed-line-ending
1313
- repo: https://github.com/psf/black
14-
rev: 23.7.0
14+
rev: 23.9.1
1515
hooks:
1616
- id: black
1717
- repo: https://github.com/keewis/blackdoc
@@ -20,12 +20,12 @@ repos:
2020
- id: blackdoc
2121
additional_dependencies: [black==22.3.0]
2222
- repo: https://github.com/astral-sh/ruff-pre-commit
23-
rev: v0.0.278
23+
rev: v0.0.290
2424
hooks:
2525
- id: ruff
2626
args: [--fix, --show-fixes]
2727
- repo: https://github.com/executablebooks/mdformat
28-
rev: 0.7.16
28+
rev: 0.7.17
2929
hooks:
3030
- id: mdformat
3131
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
@@ -36,6 +36,6 @@ repos:
3636
- id: pretty-format-toml
3737
args: [--autofix]
3838
- repo: https://github.com/gitleaks/gitleaks
39-
rev: v8.17.0
39+
rev: v8.18.0
4040
hooks:
4141
- id: gitleaks

ci/environment-ci.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ dependencies:
77
- make
88
- mypy
99
- myst-parser
10+
- pip
1011
- pre-commit
1112
- pydata-sphinx-theme
1213
- pytest
1314
- pytest-cov
1415
- sphinx
15-
- sphinx-autoapi
16+
- pip:
17+
- sphinx-autoapi
1618
# DO NOT EDIT ABOVE THIS LINE, ADD DEPENDENCIES BELOW

pyproject.toml

+4-11
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,7 @@ strict = true
3434
[tool.ruff]
3535
ignore = [
3636
# pydocstyle: Missing Docstrings
37-
"D1",
38-
# pydocstyle: numpy convention
39-
"D107",
40-
"D203",
41-
"D212",
42-
"D213",
43-
"D402",
44-
"D413",
45-
"D415",
46-
"D416",
47-
"D417"
37+
"D1"
4838
]
4939
# Black line length is 88, but black does not format comments.
5040
line-length = 110
@@ -60,6 +50,9 @@ select = [
6050
"D"
6151
]
6252

53+
[tool.ruff.pydocstyle]
54+
convention = "numpy"
55+
6356
[tool.setuptools]
6457
packages = ["ogc_api_processes_fastapi"]
6558

0 commit comments

Comments
 (0)