From 002601474a4741d48049570f977809e35684d61f Mon Sep 17 00:00:00 2001 From: malmans2 Date: Tue, 29 Oct 2024 15:48:01 +0100 Subject: [PATCH] template update --- .cruft.json | 2 +- .github/workflows/on-push.yml | 10 +++++----- .pre-commit-config.yaml | 8 ++++---- docs/conf.py | 2 ++ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.cruft.json b/.cruft.json index 98e02c6..98ecf3f 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/ecmwf-projects/cookiecutter-conda-package", - "commit": "2f1507f0a76c572a0a174fe0a831e876ea55c280", + "commit": "10b34190df391ff68b327ed9a330c412769fc474", "checkout": null, "context": { "cookiecutter": { diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml index 938ef64..d15b6e7 100644 --- a/.github/workflows/on-push.yml +++ b/.github/workflows/on-push.yml @@ -66,7 +66,7 @@ jobs: - name: Get current date id: date run: echo "date=$(date +%Y-%m-%d)" >> "${GITHUB_OUTPUT}" - - uses: mamba-org/setup-micromamba@v1 + - uses: mamba-org/setup-micromamba@v2 with: environment-file: ci/combined-environment-ci.yml environment-name: DEVELOP @@ -95,7 +95,7 @@ jobs: - name: Get current date id: date run: echo "date=$(date +%Y-%m-%d)" >> "${GITHUB_OUTPUT}" - - uses: mamba-org/setup-micromamba@v1 + - uses: mamba-org/setup-micromamba@v2 with: environment-file: ci/combined-environment-ci.yml environment-name: DEVELOP @@ -124,7 +124,7 @@ jobs: - name: Get current date id: date run: echo "date=$(date +%Y-%m-%d)" >> "${GITHUB_OUTPUT}" - - uses: mamba-org/setup-micromamba@v1 + - uses: mamba-org/setup-micromamba@v2 with: environment-file: ci/combined-environment-ci.yml environment-name: DEVELOP @@ -165,7 +165,7 @@ jobs: - name: Get current date id: date run: echo "date=$(date +%Y-%m-%d)" >> "${GITHUB_OUTPUT}" - - uses: mamba-org/setup-micromamba@v1 + - uses: mamba-org/setup-micromamba@v2 with: environment-file: ci/combined-environment${{ matrix.extra }}.yml environment-name: DEVELOP${{ matrix.extra }} @@ -234,6 +234,6 @@ jobs: with: name: distribution path: dist - - uses: pypa/gh-action-pypi-publish@v1.9.0 + - uses: pypa/gh-action-pypi-publish@v1.10.3 with: verbose: true diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bd7eb8b..d73a178 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.6.0 + rev: v5.0.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer @@ -17,13 +17,13 @@ repos: - id: blackdoc additional_dependencies: [black==23.11.0] - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.6.2 + rev: v0.7.1 hooks: - id: ruff args: [--fix, --show-fixes] - id: ruff-format - repo: https://github.com/executablebooks/mdformat - rev: 0.7.17 + rev: 0.7.18 hooks: - id: mdformat - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks @@ -34,6 +34,6 @@ repos: - id: pretty-format-toml args: [--autofix] - repo: https://github.com/gitleaks/gitleaks - rev: v8.18.4 + rev: v8.21.1 hooks: - id: gitleaks diff --git a/docs/conf.py b/docs/conf.py index 307d2db..bb01f96 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -37,8 +37,10 @@ autodoc_typehints = "none" # autoapi configuration +autoapi_add_toctree_entry = False autoapi_dirs = ["../cacholote"] autoapi_ignore = ["*/version.py"] +autoapi_member_order = "groupwise" autoapi_options = [ "members", "inherited-members",