From f526e6fa9e553a2e56f43e7cd8252df59c01fa7f Mon Sep 17 00:00:00 2001 From: Jingru923 <47444880+Jingru923@users.noreply.github.com> Date: Sun, 21 Apr 2024 10:23:06 +0200 Subject: [PATCH 1/2] Use pixi task cache (#1407) Fixes #1308 --------- Co-authored-by: Hofer-Julian Co-authored-by: Hofer-Julian <30049909+Hofer-Julian@users.noreply.github.com> --- pixi.toml | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/pixi.toml b/pixi.toml index 9db76f7c6..837fb5402 100644 --- a/pixi.toml +++ b/pixi.toml @@ -53,8 +53,18 @@ initialize-julia = { depends_on = [ # Docs build-julia-docs = { cmd = "julia --project docs/make.jl", depends_on = [ "initialize-julia", +], inputs = [ + "core", + "docs/make.jl", +], outputs = [ + "docs/build", +] } +quartodoc-build = { cmd = "quartodoc build && rm objects.json", cwd="docs", inputs = [ + "docs/_quarto.yml", + "python/ribasim", +], outputs = [ + "docs/python/reference", ] } -quartodoc-build = { cmd = "quartodoc build && rm objects.json", cwd = "docs" } quarto-preview = { cmd = "quarto preview docs", depends_on = [ "quartodoc-build", "generate-testmodels", @@ -99,11 +109,20 @@ test-ribasim-core = { cmd = "julia --project=core --eval 'using Pkg; Pkg.test()' test-ribasim-core-cov = { cmd = "julia --project=core --eval 'using Pkg; Pkg.test(coverage=true, julia_args=[\"--check-bounds=yes\"])'", depends_on = [ "generate-testmodels", ] } -generate-testmodels = "python utils/generate-testmodels.py" +generate-testmodels = { cmd = "python utils/generate-testmodels.py", inputs = [ + "python/ribasim", + "python/ribasim_testmodels", +], outputs = [ + "generated_testmodels", +] } tests = { depends_on = ["lint", "test-ribasim-python", "test-ribasim-core"] } # Codegen codegen = { cmd = "julia --project utils/gen_python.jl && ruff format python/ribasim/ribasim/schemas.py", depends_on = [ "initialize-julia", +], inputs = [ + "core", +], outputs = [ + "python/ribasim/ribasim/schemas.py", ] } # Publish build-ribasim-python-wheel = { cmd = "rm --recursive --force dist && python -m build && twine check dist/*", cwd = "python/ribasim" } From 891bf7eb800dd17e26c82ca05e6cad6ba462e9ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 10:04:29 +0200 Subject: [PATCH 2/2] Bump prefix-dev/setup-pixi from 0.5.2 to 0.6.0 (#1408) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [prefix-dev/setup-pixi](https://github.com/prefix-dev/setup-pixi) from 0.5.2 to 0.6.0.
Release notes

Sourced from prefix-dev/setup-pixi's releases.

v0.6.0

What's Changed

✨ New features

New Contributors

Full Changelog: https://github.com/prefix-dev/setup-pixi/compare/v0.5.2...v0.6.0

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=prefix-dev/setup-pixi&package-manager=github_actions&previous-version=0.5.2&new-version=0.6.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/core_testmodels.yml | 2 +- .github/workflows/core_tests.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/julia_auto_update.yml | 2 +- .github/workflows/mypy.yml | 2 +- .github/workflows/pixi_auto_update.yml | 2 +- .github/workflows/python_codegen.yml | 2 +- .github/workflows/python_tests.yml | 2 +- .github/workflows/qgis.yml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/core_testmodels.yml b/.github/workflows/core_testmodels.yml index 2c1328740..9679cbbf8 100644 --- a/.github/workflows/core_testmodels.yml +++ b/.github/workflows/core_testmodels.yml @@ -33,7 +33,7 @@ jobs: with: cache-compiled: "true" cache-registries: "true" - - uses: prefix-dev/setup-pixi@v0.5.2 + - uses: prefix-dev/setup-pixi@v0.6.0 with: pixi-version: "latest" - name: Prepare pixi diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml index e687075e7..2ba330004 100644 --- a/.github/workflows/core_tests.yml +++ b/.github/workflows/core_tests.yml @@ -33,7 +33,7 @@ jobs: with: cache-compiled: "true" cache-registries: "true" - - uses: prefix-dev/setup-pixi@v0.5.2 + - uses: prefix-dev/setup-pixi@v0.6.0 with: pixi-version: "latest" - name: Prepare pixi diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index ae317c17f..ccd50d8e5 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -24,7 +24,7 @@ jobs: with: cache-compiled: "true" cache-registries: "true" - - uses: prefix-dev/setup-pixi@v0.5.2 + - uses: prefix-dev/setup-pixi@v0.6.0 with: pixi-version: "latest" - name: Prepare pixi diff --git a/.github/workflows/julia_auto_update.yml b/.github/workflows/julia_auto_update.yml index dd0050fef..3bfd87d37 100644 --- a/.github/workflows/julia_auto_update.yml +++ b/.github/workflows/julia_auto_update.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v4 with: ssh-key: ${{ secrets.SSH_PRIVATE_KEY }} - - uses: prefix-dev/setup-pixi@v0.5.2 + - uses: prefix-dev/setup-pixi@v0.6.0 with: pixi-version: "latest" - name: Update Julia manifest file diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index dca14991d..e20da5c90 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -16,7 +16,7 @@ jobs: continue-on-error: true steps: - uses: actions/checkout@v4 - - uses: prefix-dev/setup-pixi@v0.5.2 + - uses: prefix-dev/setup-pixi@v0.6.0 with: pixi-version: "latest" - name: Prepare pixi diff --git a/.github/workflows/pixi_auto_update.yml b/.github/workflows/pixi_auto_update.yml index 39a34c520..9c3ee9e42 100644 --- a/.github/workflows/pixi_auto_update.yml +++ b/.github/workflows/pixi_auto_update.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v4 with: ssh-key: ${{ secrets.SSH_PRIVATE_KEY }} - - uses: prefix-dev/setup-pixi@v0.5.2 + - uses: prefix-dev/setup-pixi@v0.6.0 with: pixi-version: "latest" cache: false diff --git a/.github/workflows/python_codegen.yml b/.github/workflows/python_codegen.yml index 0062e307f..c14cbbd9f 100644 --- a/.github/workflows/python_codegen.yml +++ b/.github/workflows/python_codegen.yml @@ -16,7 +16,7 @@ jobs: continue-on-error: true steps: - uses: actions/checkout@v4 - - uses: prefix-dev/setup-pixi@v0.5.2 + - uses: prefix-dev/setup-pixi@v0.6.0 with: pixi-version: "latest" - name: Prepare pixi diff --git a/.github/workflows/python_tests.yml b/.github/workflows/python_tests.yml index 485e2e834..6546b815f 100644 --- a/.github/workflows/python_tests.yml +++ b/.github/workflows/python_tests.yml @@ -26,7 +26,7 @@ jobs: - py310 steps: - uses: actions/checkout@v4 - - uses: prefix-dev/setup-pixi@v0.5.2 + - uses: prefix-dev/setup-pixi@v0.6.0 with: pixi-version: "latest" - name: Prepare pixi diff --git a/.github/workflows/qgis.yml b/.github/workflows/qgis.yml index 70429ed7e..6130f4dd5 100644 --- a/.github/workflows/qgis.yml +++ b/.github/workflows/qgis.yml @@ -22,7 +22,7 @@ jobs: - windows-latest steps: - uses: actions/checkout@v4 - - uses: prefix-dev/setup-pixi@v0.5.2 + - uses: prefix-dev/setup-pixi@v0.6.0 with: pixi-version: "latest" - name: Prepare pixi