Skip to content

Commit

Permalink
Rename pixi task from post-install to install (#636)
Browse files Browse the repository at this point in the history
Post-install is arguably correct, but an implementation detail. I also
removed `pixi install` since I was wrong that this was needed.
  • Loading branch information
Hofer-Julian authored Oct 2, 2023
1 parent fd0067c commit 0582692
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/core_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
pixi-version: "v0.3.0"
cache: true
- name: Prepare pixi
run: pixi run post-install-without-pre-commit
run: pixi run install-without-pre-commit
- name: Prepare model input
run: |
pixi run generate-testmodels
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
pixi-version: "v0.3.0"
cache: true
- name: Prepare pixi
run: pixi run post-install-without-pre-commit
run: pixi run install-without-pre-commit

- 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 @@ -21,7 +21,7 @@ jobs:
pixi-version: "latest"
cache: true
- name: Prepare pixi
run: pixi run post-install-without-pre-commit
run: pixi run install-without-pre-commit
- name: Run mypy on python/ribasim
run: |
pixi run mypy-ribasim-python
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
pixi-version: "v0.3.0"
cache: true
- name: Prepare pixi
run: pixi run post-install-without-pre-commit
run: pixi run install-without-pre-commit

- name: Run tests
run: pixi run test-ribasim-python-cov
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
<build-runners>
<runner id="RUNNER_1501" name="Set up pixi" type="simpleRunner">
<parameters>
<param name="script.content"><![CDATA[pixi install
pixi run post-install]]></param>
<param name="script.content"><![CDATA[pixi run install]]></param>
<param name="teamcity.build.workingDir" value="ribasim" />
<param name="teamcity.step.mode" value="default" />
<param name="use.custom.script" value="true" />
Expand Down Expand Up @@ -84,4 +83,3 @@ pip install --no-deps "python/ribasim_testmodels"]]></param>
<cleanup />
</settings>
</build-type>

3 changes: 1 addition & 2 deletions docs/contribute/python.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ First, set up pixi as described on their getting started [page](https://prefix.d
Then set up the environment by running the following commands:

```
pixi install
pixi run post-install
pixi run install
```


Expand Down
10 changes: 5 additions & 5 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ 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-quartodoc = "pip install quartodoc"
pre-commit-install = "pre-commit install"
post-install-without-pre-commit = { depends_on = [
install-pre-commit = "pre-commit install"
install-without-pre-commit = { depends_on = [
"install-ribasim-python",
"install-ribasim-api",
"install-ribasim-testmodels",
"install-quartodoc",
] }
post-install = { depends_on = [
"post-install-without-pre-commit",
"pre-commit-install",
install = { depends_on = [
"install-without-pre-commit",
"install-pre-commit",
] }
# Docs
instantiate-julia-docs = "julia --project=docs -e \"using Pkg; Pkg.instantiate()\""
Expand Down

0 comments on commit 0582692

Please sign in to comment.