Skip to content

Commit

Permalink
Redo the "stop explicitly requiring --environment=dev when running …
Browse files Browse the repository at this point in the history
…pixi install tasks" with new pixi release (#1455)

Fixes #1324 stop explicitly requiring `--environment=dev

And reimplement all the changes in PR #1400
  • Loading branch information
Jingru923 authored May 8, 2024
1 parent 8b556aa commit 461da0c
Show file tree
Hide file tree
Showing 14 changed files with 1,507 additions and 29 deletions.
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-ci
- name: Run testmodels with Ribasim Core
run: |
pixi run ribasim-core-testmodels
2 changes: 0 additions & 2 deletions .github/workflows/core_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ jobs:
- uses: prefix-dev/[email protected]
with:
pixi-version: "latest"
- name: Prepare pixi
run: pixi run --environment=dev 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-ci

- name: Check Quarto installation and all engines
run: pixi run quarto-check
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/mypy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ jobs:
- uses: prefix-dev/[email protected]
with:
pixi-version: "latest"
- name: Prepare pixi
run: pixi run --environment=dev install-ci
- name: Run mypy on python/ribasim
run: |
pixi run mypy-ribasim-python
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/python_codegen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ jobs:
- uses: prefix-dev/[email protected]
with:
pixi-version: "latest"
- name: Prepare pixi
run: pixi run --environment=dev 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: 0 additions & 2 deletions .github/workflows/python_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ jobs:
- uses: prefix-dev/[email protected]
with:
pixi-version: "latest"
- name: Prepare pixi
run: pixi run --environment ${{ matrix.pixi-environment }} install-python
- name: Test Ribasim Python
run: pixi run --environment ${{ matrix.pixi-environment }} test-ribasim-python-cov
- name: Upload coverage to Codecov
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/qgis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ jobs:
- uses: prefix-dev/[email protected]
with:
pixi-version: "latest"
- name: Prepare pixi
run: |
pixi run --environment=dev 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 @@ -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-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-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
2 changes: 1 addition & 1 deletion docs/contribute/core.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ You can let it start automatically by following these [instructions](https://tim
There is a section on editors and IDEs for Julia on <https://julialang.org/>, scroll down to see it.
We use and recommend Microsoft's free editor [Visual Studio Code](https://code.visualstudio.com/).
When combined with the [Julia extension](https://www.julia-vscode.org/) it provides a powerful and interactive development experience.
Make sure to have the correct environment when opening your IDE by running `open-vscode.bat`, or opening a `pixi --environment=dev shell` and then calling the command to open the editor of your choice.
Make sure to have the correct environment when opening your IDE by running `open-vscode.bat`, or opening a `pixi shell` and then calling the command to open the editor of your choice.

# Developing on Ribasim

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
```

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-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-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
Loading

0 comments on commit 461da0c

Please sign in to comment.