Skip to content

Commit

Permalink
Merge branch 'master' into SIDimensionalUnit
Browse files Browse the repository at this point in the history
  • Loading branch information
jesper-friis authored Nov 23, 2023
2 parents acc498a + c2696ce commit da03e1f
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
publish:
name: External
uses: SINTEF/ci-cd/.github/workflows/cd_release.yml@v2.5.3
uses: SINTEF/ci-cd/.github/workflows/cd_release.yml@v2.6.0
if: github.repository == 'emmo-repo/EMMOntoPy' && startsWith(github.ref, 'refs/tags/v')
with:
git_username: EMMOntoPy Developers
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_automerge_dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
update-dependabot-branch:
name: External
uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.5.3
uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.6.0
if: github.repository_owner == 'emmo-repo' && startsWith(github.event.pull_request.head.ref, 'dependabot/') && github.actor == 'dependabot[bot]'
secrets:
PAT: ${{ secrets.RELEASE_PAT }}
2 changes: 1 addition & 1 deletion .github/workflows/ci_cd_updated_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
updates-to-master:
name: External
uses: SINTEF/ci-cd/.github/workflows/ci_cd_updated_default_branch.yml@v2.5.3
uses: SINTEF/ci-cd/.github/workflows/ci_cd_updated_default_branch.yml@v2.6.0
if: github.repository_owner == 'emmo-repo'
with:
git_username: EMMOntoPy Developers
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
create-collected-pr:
name: External
uses: SINTEF/ci-cd/.github/workflows/ci_update_dependencies.yml@v2.5.3
uses: SINTEF/ci-cd/.github/workflows/ci_update_dependencies.yml@v2.6.0
if: github.repository_owner == 'emmo-repo'
with:
git_username: EMMOntoPy Developers
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
tests:
name: External
uses: SINTEF/ci-cd/.github/workflows/ci_tests.yml@v2.5.3
uses: SINTEF/ci-cd/.github/workflows/ci_tests.yml@v2.6.0
with:
# General
install_extras: "[dev,docs]"
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ repos:
args: [--markdown-linebreak-ext=md]

- repo: https://github.com/ambv/black
rev: 23.10.1
rev: 23.11.0
hooks:
- id: black
name: Blacken
Expand All @@ -36,7 +36,7 @@ repos:
# exclude: ^tests/.*$

- repo: https://github.com/SINTEF/ci-cd
rev: v2.5.3
rev: v2.6.0
hooks:
- id: docs-api-reference
args:
Expand Down
4 changes: 2 additions & 2 deletions requirements_docs.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
mike~=1.1
mike~=2.0
mkdocs~=1.5
mkdocs-awesome-pages-plugin~=2.9
mkdocs-material~=9.4; python_version>="3.8"
mkdocs-material~=9.2; python_version<"3.8"
mkdocstrings[python-legacy]~=0.23.0; python_version>="3.8"
mkdocstrings[python-legacy]~=0.24.0; python_version>="3.8"
mkdocstrings[python-legacy]~=0.22.0; python_version<"3.8"

0 comments on commit da03e1f

Please sign in to comment.