Merge branch 'main' into cwa/close-24-update-deps-hook

.github/workflows/cd_release.yml

@@ -131,7 +131,7 @@ jobs:
         python -m pip install -U pip
         pip install -U setuptools wheel build
         pip install ${EDITABLE}.${{ inputs.install_extras }}
-        pip install git+https://github.com/SINTEF/ci-cd.git@v2.3.0
+        pip install git+https://github.com/SINTEF/ci-cd.git@v2.3.1
 
     - name: Parse changelog configuration
       run: |

.github/workflows/ci_cd_updated_default_branch.yml

@@ -159,7 +159,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install -U setuptools wheel
         pip install ${EDITABLE}.${{ inputs.doc_extras }}
-        pip install git+https://github.com/SINTEF/ci-cd.git@v2.3.0
+        pip install git+https://github.com/SINTEF/ci-cd.git@v2.3.1
 
     - name: Set up git user
       if: env.RELEASE_RUN == 'false'

.github/workflows/ci_check_pyproject_dependencies.yml

@@ -73,7 +73,7 @@ jobs:
         python -m pip install -U pip
         pip install -U setuptools wheel
         pip install .${{ inputs.install_extras }}
-        pip install git+https://github.com/SINTEF/ci-cd.git@v2.3.0
+        pip install git+https://github.com/SINTEF/ci-cd.git@v2.3.1
 
     - name: Set up git user
       run: |

.github/workflows/ci_tests.yml

@@ -285,7 +285,7 @@ jobs:
         python -m pip install -U pip
         pip install -U setuptools wheel
         pip install ${EDITABLE}.${{ inputs.install_extras }}
-        pip install git+https://github.com/SINTEF/ci-cd.git@v2.3.0
+        pip install git+https://github.com/SINTEF/ci-cd.git@v2.3.1
 
     - name: Update API Reference
       if: inputs.update_python_api_ref

.pre-commit-config.yaml

@@ -49,7 +49,7 @@ repos:
   # The project's documentation can be found at:
   # https://mypy.readthedocs.io/en/stable/index.html
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.1.1
+    rev: v1.2.0
     hooks:
     - id: mypy
 

CHANGELOG.md

@@ -1,17 +1,22 @@
 # Changelog
 
-## [Unreleased](https://github.com/SINTEF/ci-cd/tree/HEAD)
+## [v2.3.1](https://github.com/SINTEF/ci-cd/tree/v2.3.1) (2023-04-13)
 
-[Full Changelog](https://github.com/SINTEF/ci-cd/compare/v2.3.0...HEAD)
+[Full Changelog](https://github.com/SINTEF/ci-cd/compare/v2.3.0...v2.3.1)
 
-**Implemented enhancements:**
+**Merged pull requests:**
 
-- Use GH usernames for release changelogs [\#102](https://github.com/SINTEF/ci-cd/issues/102)
+- \[Auto-generated\] Update dependencies [\#138](https://github.com/SINTEF/ci-cd/pull/138) ([TEAM4-0](https://github.com/TEAM4-0))
+- \[Auto-generated\] Update dependencies [\#131](https://github.com/SINTEF/ci-cd/pull/131) ([TEAM4-0](https://github.com/TEAM4-0))
 
 ## [v2.3.0](https://github.com/SINTEF/ci-cd/tree/v2.3.0) (2023-03-24)
 
 [Full Changelog](https://github.com/SINTEF/ci-cd/compare/v2.2.1...v2.3.0)
 
+**Implemented enhancements:**
+
+- Use GH usernames for release changelogs [\#102](https://github.com/SINTEF/ci-cd/issues/102)
+
 **Fixed bugs:**
 
 - Wrongly named option used in callable workflow [\#125](https://github.com/SINTEF/ci-cd/issues/125)

ci_cd/__init__.py

@@ -1,4 +1,4 @@
 """CI/CD Tools. Tiny package to run invoke tasks as a standalone program."""
-__version__ = "2.3.0"
+__version__ = "2.3.1"
 __author__ = "Casper Welzel Andersen"
 __author_email__ = "casper.w.andersen@sintef.no"

docs/hooks/docs_api_reference.md

@@ -58,7 +58,7 @@ It is meant to be complete as is.
 ```yaml
 repos:
   - repo: https://github.com/SINTEF/ci-cd
-    rev: v2.3.0
+    rev: v2.3.1
     hooks:
     - id: docs-api-reference
       args:

docs/hooks/docs_landing_page.md

@@ -32,7 +32,7 @@ It is meant to be complete as is.
 ```yaml
 repos:
   - repo: https://github.com/SINTEF/ci-cd
-    rev: v2.3.0
+    rev: v2.3.1
     hooks:
     - id: docs-landing-page
       args:

docs/index.md

@@ -1,6 +1,6 @@
 # CI/CD tools
 
-**Current version to use:** `v2.3.0`
+**Current version to use:** `v2.3.1`
 
 Use tried and tested continuous integration (CI) and continuous deployment (CD) tools from this repository.
 

docs/workflows/cd_release.md

@@ -29,7 +29,7 @@ See the [proper section](../hooks/docs_api_reference.md#using-it-together-with-c
 The content of repository files can be updated to use the new version where necessary.
 This is done through the `version_update_changes` (and `version_update_changes_separator`) inputs.
 
-To see an example of how to use the `version_update_changes` (and `version_update_changes_separator`) see for example the [workflow used by the SINTEF/ci-cd repository](https://github.com/SINTEF/ci-cd/blob/v2.3.0/.github/workflows/_local_cd_release.yml) calling the _CD Release_ workflow.
+To see an example of how to use the `version_update_changes` (and `version_update_changes_separator`) see for example the [workflow used by the SINTEF/ci-cd repository](https://github.com/SINTEF/ci-cd/blob/v2.3.1/.github/workflows/_local_cd_release.yml) calling the _CD Release_ workflow.
 
 Some notes to consider and respect when using `version_update_changes` are:
 
@@ -108,7 +108,7 @@ on:
 jobs:
   publish:
     name: Publish package and documentation
-    uses: SINTEF/ci-cd/.github/workflows/cd_release.yml@v2.3.0
+    uses: SINTEF/ci-cd/.github/workflows/cd_release.yml@v2.3.1
     if: github.repository == 'SINTEF/my-python-package' && startsWith(github.ref, 'refs/tags/v')
     with:
       git_username: "Casper Welzel Andersen"

docs/workflows/ci_automerge_prs.md

@@ -52,7 +52,7 @@ on:
 jobs:
   update-dependency-branch:
     name: Call external workflow
-    uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.3.0
+    uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.3.1
     if: github.repository_owner == 'SINTEF' && ( ( startsWith(github.event.pull_request.head.ref, 'dependabot/') && github.actor == 'dependabot[bot]' ) || ( github.event.pull_request.head.ref == 'ci/update-pyproject' && github.actor == 'CasperWA' ) )
     secrets:
       PAT: ${{ secrets.RELEASE_PAT }}
@@ -73,7 +73,7 @@ on:
 jobs:
   update-dependency-branch:
     name: Call external workflow
-    uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.3.0
+    uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.3.1
     if: github.repository_owner == 'SINTEF' && ( ( startsWith(github.event.pull_request.head.ref, 'dependabot/') && github.actor == 'dependabot[bot]' ) || ( github.event.pull_request.head.ref == 'ci/update-pyproject' && github.actor == 'CasperWA' ) )
     with:
       perform_changes: true
@@ -97,7 +97,7 @@ on:
 jobs:
   update-dependency-branch:
     name: Call external workflow
-    uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.3.0
+    uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.3.1
     if: github.repository_owner == 'SINTEF' && ( ( startsWith(github.event.pull_request.head.ref, 'dependabot/') && github.actor == 'dependabot[bot]' ) || ( github.event.pull_request.head.ref == 'ci/update-pyproject' && github.actor == 'CasperWA' ) )
     with:
       perform_changes: true

docs/workflows/ci_cd_updated_default_branch.md

@@ -79,7 +79,7 @@ on:
 jobs:
   updates-to-stable:
     name: Call external workflow
-    uses: SINTEF/ci-cd/.github/workflows/ci_cd_updated_default_branch.yml@v2.3.0
+    uses: SINTEF/ci-cd/.github/workflows/ci_cd_updated_default_branch.yml@v2.3.1
     if: github.repository_owner == 'SINTEF'
     with:
       git_username: "Casper Welzel Andersen"

docs/workflows/ci_check_pyproject_dependencies.md

@@ -33,7 +33,7 @@ Here is an example of different lines given as value for the `ignore` option tha
 # ...
 jobs:
   check-dependencies:
-    uses: SINTEF/ci-cd/.github/workflows/ci_check_pyproject_dependencies.yml@v2.3.0
+    uses: SINTEF/ci-cd/.github/workflows/ci_check_pyproject_dependencies.yml@v2.3.1
     with:
       # ...
       # For Sphinx, ignore all updates for/from version 4.5.0 and up / keep the minimum version for Sphinx at 4.5.0.
@@ -88,7 +88,7 @@ on:
 jobs:
   check-dependencies:
     name: Call external workflow
-    uses: SINTEF/ci-cd/.github/workflows/ci_check_pyproject_dependencies.yml@v2.3.0
+    uses: SINTEF/ci-cd/.github/workflows/ci_check_pyproject_dependencies.yml@v2.3.1
     if: github.repository_owner == 'SINTEF'
     with:
       git_username: "Casper Welzel Andersen"

docs/workflows/ci_tests.md

@@ -136,7 +136,7 @@ on:
 jobs:
   tests:
     name: Run basic tests
-    uses: SINTEF/ci-cd/.github/workflows/ci_tests.yml@v2.3.0
+    uses: SINTEF/ci-cd/.github/workflows/ci_tests.yml@v2.3.1
     with:
       python_version_pylint_safety: "3.8"
       python_version_docs: "3.7"
@@ -164,7 +164,7 @@ on:
 jobs:
   tests:
     name: Run basic tests
-    uses: SINTEF/ci-cd/.github/workflows/ci_tests.yml@v2.3.0
+    uses: SINTEF/ci-cd/.github/workflows/ci_tests.yml@v2.3.1
     with:
       python_version_pylint_safety: "3.8"
       python_version_docs: "3.7"

docs/workflows/ci_update_dependencies.md

@@ -62,7 +62,7 @@ on:
 jobs:
   check-dependencies:
     name: Call external workflow
-    uses: SINTEF/ci-cd/.github/workflows/ci_update_dependencies.yml@v2.3.0
+    uses: SINTEF/ci-cd/.github/workflows/ci_update_dependencies.yml@v2.3.1
     if: github.repository_owner == 'SINTEF'
     with:
       git_username: "Casper Welzel Andersen"

pyproject.toml

@@ -37,12 +37,12 @@ dependencies = [
 docs = [
     "mike ~=1.1",
     "mkdocs ~=1.4",
-    "mkdocs-awesome-pages-plugin ~=2.8",
+    "mkdocs-awesome-pages-plugin ~=2.9",
     "mkdocs-material ~=9.1",
-    "mkdocstrings[python-legacy] ~=0.20.0",
+    "mkdocstrings[python-legacy] ~=0.21.2",
 ]
 testing = [
-    "pytest ~=7.2",
+    "pytest ~=7.3",
     "pytest-cov ~=4.0",
 ]
 dev = [