Skip to content

Commit

Permalink
Install QGIS plugins on pixi run install (#1140)
Browse files Browse the repository at this point in the history
Discussed with @deltamarnix. No real reason not to do this, it only
takes a few seconds.
  • Loading branch information
visr authored Feb 16, 2024
1 parent a31610c commit f690380
Show file tree
Hide file tree
Showing 14 changed files with 19 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/core_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
with:
pixi-version: "latest"
- name: Prepare pixi
run: pixi run install-without-pre-commit
run: pixi run install-ci
- name: Test Ribasim Core
run: |
pixi run test-ribasim-core-cov
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
with:
pixi-version: "latest"
- name: Prepare pixi
run: pixi run install-without-pre-commit
run: pixi run install-ci

- name: Check Quarto installation and all engines
run: pixi run quarto-check
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
with:
pixi-version: "latest"
- name: Prepare pixi
run: pixi run install-without-pre-commit
run: pixi run install-ci
- name: Run mypy on python/ribasim
run: |
pixi run mypy-ribasim-python
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/qgis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
pixi-version: "latest"
- name: Prepare pixi
run: |
pixi run install-without-pre-commit
pixi run install-ci
- name: Run tests
run: pixi run test-ribasim-qgis-cov
- name: Upload coverage to Codecov
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ source /usr/share/Modules/init/bash
module load pixi
pixi --version
pixi run install-without-pre-commit]]></param>
pixi run install-ci]]></param>
<param name="teamcity.build.workingDir" value="ribasim" />
<param name="teamcity.step.mode" value="default" />
<param name="use.custom.script" value="true" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ source /usr/share/Modules/init/bash
module load pixi
pixi --version
pixi run install-without-pre-commit]]></param>
pixi run install-ci]]></param>
<param name="teamcity.build.workingDir" value="ribasim" />
<param name="teamcity.step.mode" value="default" />
<param name="use.custom.script" value="true" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ source /usr/share/Modules/init/bash
module load pixi
pixi --version
pixi run install-without-pre-commit]]></param>
pixi run install-ci]]></param>
<param name="teamcity.build.workingDir" value="ribasim" />
<param name="teamcity.step.mode" value="default" />
<param name="use.custom.script" value="true" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ source /usr/share/Modules/init/bash
module load pixi
pixi --version
pixi run install-without-pre-commit]]></param>
pixi run install-ci]]></param>
<param name="teamcity.build.workingDir" value="ribasim" />
<param name="teamcity.step.mode" value="default" />
<param name="use.custom.script" value="true" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ source /usr/share/Modules/init/bash
module load pixi
pixi --version
pixi run install-without-pre-commit]]></param>
pixi run install-ci]]></param>
<param name="teamcity.build.workingDir" value="ribasim" />
<param name="teamcity.step.mode" value="default" />
<param name="use.custom.script" value="true" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<runner id="RUNNER_2415" name="Set up pixi" type="simpleRunner">
<parameters>
<param name="script.content"><![CDATA[pixi --version
pixi run install-without-pre-commit]]></param>
pixi run install-ci]]></param>
<param name="teamcity.build.workingDir" value="ribasim" />
<param name="teamcity.step.mode" value="default" />
<param name="use.custom.script" value="true" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<build-runners>
<runner id="RUNNER_2418" name="Set up pixi" type="simpleRunner">
<parameters>
<param name="script.content" value="pixi run install-without-pre-commit" />
<param name="script.content" value="pixi run install-ci" />
<param name="teamcity.build.workingDir" value="ribasim" />
<param name="teamcity.step.mode" value="default" />
<param name="use.custom.script" value="true" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<build-runners>
<runner id="RUNNER_1501" name="Set up pixi" type="simpleRunner">
<parameters>
<param name="script.content" value="pixi run install-without-pre-commit" />
<param name="script.content" value="pixi run install-ci" />
<param name="teamcity.build.workingDir" value="ribasim" />
<param name="teamcity.step.mode" value="default" />
<param name="use.custom.script" value="true" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<build-runners>
<runner id="RUNNER_1501" name="Set up pixi" type="simpleRunner">
<parameters>
<param name="script.content" value="pixi run install-without-pre-commit" />
<param name="script.content" value="pixi run install-ci" />
<param name="teamcity.build.workingDir" value="ribasim" />
<param name="teamcity.step.mode" value="default" />
<param name="use.custom.script" value="true" />
Expand Down
8 changes: 6 additions & 2 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,18 @@ install-ribasim-python = "pip install --no-deps --editable python/ribasim"
install-ribasim-api = "pip install --no-deps --editable python/ribasim_api"
install-ribasim-testmodels = "pip install --no-deps --editable python/ribasim_testmodels"
install-pre-commit = "pre-commit install"
install-without-pre-commit = { depends_on = [
install-ci = { depends_on = [
"install-julia",
"update-registry-julia",
"install-ribasim-python",
"install-ribasim-api",
"install-ribasim-testmodels",
] }
install = { depends_on = ["install-without-pre-commit", "install-pre-commit"] }
install = { depends_on = [
"install-ci",
"install-qgis-plugins",
"install-pre-commit"
] }
# Instantiate
update-registry-julia = "julia --eval='using Pkg; Registry.update()'"
update-manifest-julia = "julia --project --eval='using Pkg; Pkg.update()'"
Expand Down

0 comments on commit f690380

Please sign in to comment.