Merge branch 'master' into flb/excelparser_docupdate

emmo-repo · Jun 9, 2023 · 5f7709d · 5f7709d
2 parents e230355 + 61b3664
commit 5f7709d
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/cd_publish.yml b/.github/workflows/cd_publish.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   publish:
     name: External
-    uses: SINTEF/ci-cd/.github/workflows/cd_release.yml@v2.3.1
+    uses: SINTEF/ci-cd/.github/workflows/cd_release.yml@v2.4.0
     if: github.repository == 'emmo-repo/EMMOntoPy' && startsWith(github.ref, 'refs/tags/v')
     with:
       git_username: EMMOntoPy Developers

diff --git a/.github/workflows/ci_automerge_dependabot.yml b/.github/workflows/ci_automerge_dependabot.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   update-dependabot-branch:
     name: External
-    uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.3.1
+    uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.4.0
     if: github.repository_owner == 'emmo-repo' && startsWith(github.event.pull_request.head.ref, 'dependabot/') && github.actor == 'dependabot[bot]'
     secrets:
       PAT: ${{ secrets.RELEASE_PAT }}
diff --git a/.github/workflows/ci_cd_updated_master.yml b/.github/workflows/ci_cd_updated_master.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   updates-to-master:
     name: External
-    uses: SINTEF/ci-cd/.github/workflows/ci_cd_updated_default_branch.yml@v2.3.1
+    uses: SINTEF/ci-cd/.github/workflows/ci_cd_updated_default_branch.yml@v2.4.0
     if: github.repository_owner == 'emmo-repo'
     with:
       git_username: EMMOntoPy Developers

diff --git a/.github/workflows/ci_dependabot.yml b/.github/workflows/ci_dependabot.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   create-collected-pr:
     name: External
-    uses: SINTEF/ci-cd/.github/workflows/ci_update_dependencies.yml@v2.3.1
+    uses: SINTEF/ci-cd/.github/workflows/ci_update_dependencies.yml@v2.4.0
     if: github.repository_owner == 'emmo-repo'
     with:
       git_username: EMMOntoPy Developers

diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   tests:
     name: External
-    uses: SINTEF/ci-cd/.github/workflows/ci_tests.yml@v2.3.1
+    uses: SINTEF/ci-cd/.github/workflows/ci_tests.yml@v2.4.0
     with:
       # General
       install_extras: "[dev,docs]"

diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -2,4 +2,4 @@ pre-commit>=2.21.0,<3; python_version<"3.8"
 pre-commit~=3.3; python_version>="3.8"
 pylint~=2.17
 pytest~=7.3
-pytest-cov~=4.0
+pytest-cov~=4.1
diff --git a/requirements_docs.txt b/requirements_docs.txt
@@ -2,4 +2,4 @@ mike~=1.1
 mkdocs~=1.4
 mkdocs-awesome-pages-plugin~=2.9
 mkdocs-material~=9.1
-mkdocstrings[python-legacy]~=0.21.2
+mkdocstrings[python-legacy]~=0.22.0