Skip to content

Commit 4468ede

Browse files
committed
template update
1 parent b492cf4 commit 4468ede

12 files changed

+31
-21
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": "c6665306749b5dd3b4ec0fdcf1cb31d18fe23511",
3+
"commit": "104191f7bf58670f65db81e04b34e7bf56bb4985",
44
"checkout": null,
55
"context": {
66
"cookiecutter": {

.github/workflows/on-push.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ jobs:
2323
runs-on: ubuntu-latest
2424
steps:
2525
- uses: actions/checkout@v4
26-
- uses: actions/setup-python@v4
26+
- uses: actions/setup-python@v5
2727
with:
2828
python-version: 3.x
29-
- uses: pre-commit/[email protected].0
29+
- uses: pre-commit/[email protected].1
3030

3131
combine-environments:
3232
runs-on: ubuntu-latest
3333

3434
steps:
3535
- uses: actions/checkout@v4
36-
- uses: actions/setup-python@v4
36+
- uses: actions/setup-python@v5
3737
with:
3838
python-version: 3.x
3939
- name: Install conda-merge
@@ -44,7 +44,7 @@ jobs:
4444
for SUFFIX in ci integration; do
4545
conda-merge ci/environment-$SUFFIX.yml environment.yml > ci/combined-environment-$SUFFIX.yml || exit
4646
done
47-
- uses: actions/upload-artifact@v3
47+
- uses: actions/upload-artifact@v4
4848
with:
4949
name: combined-environments
5050
path: ci/combined-environment-*.yml
@@ -59,7 +59,7 @@ jobs:
5959

6060
steps:
6161
- uses: actions/checkout@v4
62-
- uses: actions/download-artifact@v3
62+
- uses: actions/download-artifact@v4
6363
with:
6464
name: combined-environments
6565
path: ci
@@ -88,7 +88,7 @@ jobs:
8888

8989
steps:
9090
- uses: actions/checkout@v4
91-
- uses: actions/download-artifact@v3
91+
- uses: actions/download-artifact@v4
9292
with:
9393
name: combined-environments
9494
path: ci
@@ -117,7 +117,7 @@ jobs:
117117

118118
steps:
119119
- uses: actions/checkout@v4
120-
- uses: actions/download-artifact@v3
120+
- uses: actions/download-artifact@v4
121121
with:
122122
name: combined-environments
123123
path: ci
@@ -154,7 +154,7 @@ jobs:
154154

155155
steps:
156156
- uses: actions/checkout@v4
157-
- uses: actions/download-artifact@v3
157+
- uses: actions/download-artifact@v4
158158
with:
159159
name: combined-environments
160160
path: ci
@@ -189,7 +189,7 @@ jobs:
189189
190190
steps:
191191
- uses: actions/checkout@v4
192-
- uses: actions/setup-python@v4
192+
- uses: actions/setup-python@v5
193193
with:
194194
python-version: '3.11'
195195
- name: Install package
@@ -206,7 +206,7 @@ jobs:
206206
python -m twine check --strict * || exit
207207
python -c "import cads_broker" || exit
208208
cd ..
209-
- uses: actions/upload-artifact@v3
209+
- uses: actions/upload-artifact@v4
210210
with:
211211
name: distribution
212212
path: dist
@@ -226,10 +226,10 @@ jobs:
226226
id-token: write # IMPORTANT: this permission is mandatory for trusted publish
227227

228228
steps:
229-
- uses: actions/download-artifact@v3
229+
- uses: actions/download-artifact@v4
230230
with:
231231
name: distribution
232232
path: dist
233-
- uses: pypa/[email protected].11
233+
- uses: pypa/[email protected].14
234234
with:
235235
verbose: true

.pre-commit-config.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.5.0
3+
rev: v4.6.0
44
hooks:
55
- id: trailing-whitespace
66
- id: end-of-file-fixer
@@ -17,7 +17,7 @@ repos:
1717
- id: blackdoc
1818
additional_dependencies: [black==23.11.0]
1919
- repo: https://github.com/astral-sh/ruff-pre-commit
20-
rev: v0.1.6
20+
rev: v0.3.5
2121
hooks:
2222
- id: ruff
2323
args: [--fix, --show-fixes]
@@ -27,13 +27,13 @@ repos:
2727
hooks:
2828
- id: mdformat
2929
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
30-
rev: v2.11.0
30+
rev: v2.13.0
3131
hooks:
3232
- id: pretty-format-yaml
3333
args: [--autofix, --preserve-quotes]
3434
- id: pretty-format-toml
3535
args: [--autofix]
3636
- repo: https://github.com/gitleaks/gitleaks
37-
rev: v8.18.1
37+
rev: v8.18.2
3838
hooks:
3939
- id: gitleaks

alembic/versions/01374a5b3c41_add_qos_status_column.py

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
Create Date: 2023-09-08 12:21:35.601773
66
77
"""
8+
89
import sqlalchemy as sa
910
from sqlalchemy.dialects.postgresql import JSONB
1011

alembic/versions/6ee20703d353_cascading_delete_on_events.py

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
Create Date: 2024-03-28 12:07:05.247016
66
77
"""
8+
89
import datetime
910

1011
import sqlalchemy as sa

alembic/versions/8924bc485ad5_add_events_table.py

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
Create Date: 2024-01-26 14:43:44.421999
66
77
"""
8+
89
import sqlalchemy as sa
910

1011
from alembic import op

alembic/versions/ba380b5614b8_add_response_log_column.py

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
Create Date: 2023-08-03 14:10:38.083255
66
77
"""
8+
89
import sqlalchemy as sa
910
from sqlalchemy.dialects.postgresql import JSONB
1011

alembic/versions/cc6cc1cb3529_add_portal_field.py

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
Create Date: 2023-06-14 14:00:25.914273
66
77
"""
8+
89
import sqlalchemy as sa
910

1011
from alembic import op

alembic/versions/d51c4dd28c1b_rename_column_for_the_request_error.py

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
Create Date: 2023-05-12 10:52:11.114619
66
77
"""
8+
89
import sqlalchemy as sa
910

1011
from alembic import op

alembic/versions/e09564dc7652_add_adaptor_configuration_table.py

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
Create Date: 2023-07-24 10:41:11.679876
66
77
"""
8+
89
import sqlalchemy as sa
910
from sqlalchemy.dialects.postgresql import JSONB
1011

cads_broker/entry_points.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""Module for entry points."""
2+
23
import datetime
34
import os
45
from typing import Any, Optional

pyproject.toml

+6-4
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,15 @@ minversion = "6.0"
4343
postgresql_user = "broker"
4444

4545
[tool.ruff]
46+
# Same as Black.
47+
indent-width = 4
48+
line-length = 88
49+
50+
[tool.ruff.lint]
4651
ignore = [
4752
# pydocstyle: Missing Docstrings
4853
"D1"
4954
]
50-
# Same as Black.
51-
indent-width = 4
52-
line-length = 88
5355
select = [
5456
# pyflakes
5557
"F",
@@ -65,7 +67,7 @@ select = [
6567
[tool.ruff.lint.pycodestyle]
6668
max-line-length = 110
6769

68-
[tool.ruff.pydocstyle]
70+
[tool.ruff.lint.pydocstyle]
6971
convention = "numpy"
7072

7173
[tool.setuptools]

0 commit comments

Comments
 (0)