diff --git a/.cruft.json b/.cruft.json index 9d5e94b..2972119 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/ecmwf-projects/cookiecutter-conda-package", - "commit": "c6665306749b5dd3b4ec0fdcf1cb31d18fe23511", + "commit": "104191f7bf58670f65db81e04b34e7bf56bb4985", "checkout": null, "context": { "cookiecutter": { diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml index b72946b..2f52def 100644 --- a/.github/workflows/on-push.yml +++ b/.github/workflows/on-push.yml @@ -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/action@v3.0.0 + - uses: pre-commit/action@v3.0.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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -154,7 +154,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: combined-environments path: ci @@ -189,7 +189,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 @@ -206,7 +206,7 @@ jobs: python -m twine check --strict * || exit python -c "import cads_common" || exit cd .. - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: distribution path: dist @@ -226,10 +226,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/gh-action-pypi-publish@v1.8.11 + - uses: pypa/gh-action-pypi-publish@v1.8.14 with: verbose: true diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a831ff0..d3deef5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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 @@ -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] @@ -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 diff --git a/cads_common/logging.py b/cads_common/logging.py index 22c487b..e732b44 100644 --- a/cads_common/logging.py +++ b/cads_common/logging.py @@ -6,7 +6,7 @@ def structlog_configure( - additional_processors: list[structlog.typing.Processor] = [] + additional_processors: list[structlog.typing.Processor] = [], ) -> None: """Configure structlog logging.""" structlog.configure( diff --git a/pyproject.toml b/pyproject.toml index a3bd3de..823ee1b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,13 +25,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", @@ -47,7 +49,7 @@ select = [ [tool.ruff.lint.pycodestyle] max-line-length = 110 -[tool.ruff.pydocstyle] +[tool.ruff.lint.pydocstyle] convention = "numpy" [tool.setuptools]