Skip to content

Commit

Permalink
template update
Browse files Browse the repository at this point in the history
  • Loading branch information
malmans2 committed Apr 9, 2024
1 parent 6bd9ef0 commit ae0f149
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .cruft.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"template": "https://github.com/ecmwf-projects/cookiecutter-conda-package",
"commit": "c6665306749b5dd3b4ec0fdcf1cb31d18fe23511",
"commit": "104191f7bf58670f65db81e04b34e7bf56bb4985",
"checkout": null,
"context": {
"cookiecutter": {
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: 3.x
- uses: pre-commit/[email protected].0
- uses: pre-commit/[email protected].1

combine-environments:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: 3.x
- name: Install conda-merge
Expand All @@ -44,7 +44,7 @@ jobs:
for SUFFIX in ci integration; do
conda-merge ci/environment-$SUFFIX.yml environment.yml > ci/combined-environment-$SUFFIX.yml || exit
done
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: combined-environments
path: ci/combined-environment-*.yml
Expand All @@ -59,7 +59,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: combined-environments
path: ci
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: combined-environments
path: ci
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: combined-environments
path: ci
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: combined-environments
path: ci
Expand Down Expand Up @@ -191,7 +191,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11'
- name: Install package
Expand All @@ -208,7 +208,7 @@ jobs:
python -m twine check --strict * || exit
python -c "import ogc_api_processes_fastapi" || exit
cd ..
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: distribution
path: dist
Expand All @@ -228,10 +228,10 @@ jobs:
id-token: write # IMPORTANT: this permission is mandatory for trusted publish

steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: distribution
path: dist
- uses: pypa/[email protected].11
- uses: pypa/[email protected].14
with:
verbose: true
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v4.6.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand All @@ -17,7 +17,7 @@ repos:
- id: blackdoc
additional_dependencies: [black==23.11.0]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.6
rev: v0.3.5
hooks:
- id: ruff
args: [--fix, --show-fixes]
Expand All @@ -27,13 +27,13 @@ repos:
hooks:
- id: mdformat
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
rev: v2.11.0
rev: v2.13.0
hooks:
- id: pretty-format-yaml
args: [--autofix, --preserve-quotes]
- id: pretty-format-toml
args: [--autofix]
- repo: https://github.com/gitleaks/gitleaks
rev: v8.18.1
rev: v8.18.2
hooks:
- id: gitleaks
10 changes: 6 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,15 @@ branch = true
strict = true

[tool.ruff]
# Same as Black.
indent-width = 4
line-length = 88

[tool.ruff.lint]
ignore = [
# pydocstyle: Missing Docstrings
"D1"
]
# Same as Black.
indent-width = 4
line-length = 88
select = [
# pyflakes
"F",
Expand All @@ -53,7 +55,7 @@ select = [
[tool.ruff.lint.pycodestyle]
max-line-length = 110

[tool.ruff.pydocstyle]
[tool.ruff.lint.pydocstyle]
convention = "numpy"

[tool.setuptools]
Expand Down

0 comments on commit ae0f149

Please sign in to comment.