Skip to content

Commit

Permalink
Merge branch 'master' into pre-commit-ci-update-config
Browse files Browse the repository at this point in the history
  • Loading branch information
CasperWA authored Jan 31, 2025
2 parents a2e98c6 + 0a73599 commit 686a11d
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
build:
name: External
uses: SINTEF/ci-cd/.github/workflows/cd_release.yml@v2.8.3
uses: SINTEF/ci-cd/.github/workflows/cd_release.yml@v2.9.0
if: github.repository == 'EMMC-ASBL/oteapi-dlite' && startsWith(github.ref, 'refs/tags/v')
with:
# General
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_automerge_dependency_prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
update-dependencies-branch:
name: External
uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.8.3
uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.9.0
if: github.repository_owner == 'EMMC-ASBL' && ( ( startsWith(github.event.pull_request.head.ref, 'dependabot/') && github.actor == 'dependabot[bot]' ) || ( github.event.pull_request.head.ref == 'pre-commit-ci-update-config' && github.actor == 'pre-commit.ci[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:
update-deps-branch-and-docs:
name: External
uses: SINTEF/ci-cd/.github/workflows/ci_cd_updated_default_branch.yml@v2.8.3
uses: SINTEF/ci-cd/.github/workflows/ci_cd_updated_default_branch.yml@v2.9.0
if: github.repository_owner == 'EMMC-ASBL'
with:
# General
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
basic-tests:
name: External
uses: SINTEF/ci-cd/.github/workflows/ci_tests.yml@v2.8.3
uses: SINTEF/ci-cd/.github/workflows/ci_tests.yml@v2.9.0
with:
## General settings:
install_extras: "[dev]"
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ dynamic = ["version"]

dependencies = [
# Core dependencies
"DLite-Python>=0.4.5,<1",
"DLite-Python>=0.4.5,<0.5.24",
"numpy>=1.21,<3",
"oteapi-core>=0.7.0.dev3,<1",
"pydantic>=2.1,<3",
"pydantic-settings>=2.0,<3",
"typing-extensions>=4.8,<5; python_version<'3.10'",
"Pillow>=9.0.1,<12",
"tripper>=0.3.4, <1",
"tripper>=0.3.4, <0.3.5",
]

[project.optional-dependencies]
Expand Down

0 comments on commit 686a11d

Please sign in to comment.