Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pixi run --environment=dev install to pixi run install #1400

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/core_testmodels.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 --environment=dev install-ci
run: pixi run install install-ci
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
run: pixi run install install-ci
run: pixi run install-ci

Same for the others

- name: Run testmodels with Ribasim Core
run: |
pixi run ribasim-core-testmodels
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 --environment=dev install-ci
run: pixi run install 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 --environment=dev install-ci
run: pixi run install install-ci

- name: Check Quarto installation and all engines
run: pixi run quarto-check
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mypy.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 --environment=dev install-ci
run: pixi run install install-ci
- name: Run mypy on python/ribasim
run: |
pixi run mypy-ribasim-python
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python_codegen.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 --environment=dev install-ci
run: pixi run install install-ci
- name: Test if codegen runs without errors
run: pixi run codegen
- name: Ensure that no code has been generated
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 --environment=dev install-ci
pixi run install 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 --environment=dev install-ci]]></param>
pixi run install 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 @@ -17,7 +17,7 @@ source /usr/share/Modules/init/bash

module load pixi
pixi --version
pixi run --environment=dev install-ci]]></param>
pixi run install 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 @@ -17,7 +17,7 @@ source /usr/share/Modules/init/bash

module load pixi
pixi --version
pixi run --environment=dev install-ci]]></param>
pixi run install 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 --environment=dev install-ci]]></param>
pixi run install 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 @@ -16,7 +16,7 @@
<runner id="RUNNER_2415" name="Set up pixi" type="simpleRunner">
<parameters>
<param name="script.content"><![CDATA[pixi --version
pixi run --environment=dev install-ci]]></param>
pixi run install 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 @@ -11,7 +11,7 @@
<build-runners>
<runner id="RUNNER_2418" name="Set up pixi" type="simpleRunner">
<parameters>
<param name="script.content" value="pixi run --environment=dev install-ci" />
<param name="script.content" value="pixi run install 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 @@ -12,7 +12,7 @@
<build-runners>
<runner id="RUNNER_1501" name="Set up pixi" type="simpleRunner">
<parameters>
<param name="script.content" value="pixi run --environment=dev install-ci" />
<param name="script.content" value="pixi run install 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
2 changes: 1 addition & 1 deletion docs/contribute/index.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,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:

```sh
pixi run --environment=dev install
pixi run install install
```

This will automatically install all required packages for development.
Expand Down
4 changes: 2 additions & 2 deletions docs/contribute/qgis.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ title: "QGIS plugin development"
# Set up the developer environment

After you have installed the environment as described [here](index.qmd) you must still activate the QGIS plugins.
The simplest way to do this is by running `pixi run --environment=dev install-qgis-plugins`.
The simplest way to do this is by running `pixi run install install-qgis-plugins`.
It grabs the latest version of the iMOD QGIS plugin and it makes a symlink to the ribasim_qgis folder so that QGIS can find it.
It also installs plugins that make it possible to reload and debug your plugin while QGIS is open.

Expand Down Expand Up @@ -36,7 +36,7 @@ Then simply call `pixi run test-ribasim-qgis`.

# Debugging

After installing the plugins via `pixi run --environment=dev install-qgis-plugins`.
After installing the plugins via `pixi run install install-qgis-plugins`.
Extra debugging tools are also installed in QGIS that is installed within your pixi environment.

After you have started `pixi run qgis`, you can make alterations to the Python code and use the [Plugin Reloader](https://github.com/borysiasty/plugin_reloader) to reload the plugin without restarting QGIS.
Expand Down
2 changes: 1 addition & 1 deletion open-vscode.bat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pixi run --environment=dev code . | exit
pixi run install code . | exit
22 changes: 13 additions & 9 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,19 @@ documentation = "https://deltares.github.io/Ribasim/"
repository = "https://github.com/Deltares/Ribasim"

[tasks]
install-ribasim-python ={ path = "python/ribasim", editable = true }
install-ribasim-api ={ path = "python/ribasim_api", editable = true }
install-ribasim-testmodels ={ path = "python/ribasim_testmodels", editable = true }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With editable installs the installation is no longer done with a task, but automatically if listed under pypi dependencies. See Deltares/Ribasim-NL#75 for an example.

# Installation
install-ribasim-python = "pip install --no-build-isolation --no-deps --disable-pip-version-check --editable python/ribasim"
install-ribasim-api = "pip install --no-build-isolation --no-deps --disable-pip-version-check --editable python/ribasim_api"
install-ribasim-testmodels = "pip install --no-build-isolation --no-deps --disable-pip-version-check --editable python/ribasim_testmodels"
install-python = { depends_on = [
"install-ribasim-python",
"install-ribasim-api",
"install-ribasim-testmodels",
] }
# install-ribasim-python = "pip install --no-build-isolation --no-deps --disable-pip-version-check --editable python/ribasim"
# install-ribasim-api = "pip install --no-build-isolation --no-deps --disable-pip-version-check --editable python/ribasim_api"
# install-ribasim-testmodels = "pip install --no-build-isolation --no-deps --disable-pip-version-check --editable python/ribasim_testmodels"
# install-python = { depends_on = [
# "install-ribasim-python",
# "install-ribasim-api",
# "install-ribasim-testmodels",
# ] }

# Tests
test-ribasim-python = "pytest --numprocesses=4 python/ribasim/tests"
test-ribasim-python-cov = "pytest --numprocesses=4 --cov=ribasim --cov-report=xml python/ribasim/tests"
Expand All @@ -32,7 +36,7 @@ test-ribasim-api = "pytest --basetemp=python/ribasim_api/tests/temp --junitxml=r
install-julia = "juliaup add 1.10.0 && juliaup default 1.10.0"
install-pre-commit = "pre-commit install"
install-ci = { depends_on = [
"install-python",
# "install-python",
"install-julia",
"update-registry-julia",

Expand Down
Loading