diff --git a/.github/workflows/core_testmodels.yml b/.github/workflows/core_testmodels.yml index 91d5f6e3f..29a7ba64f 100644 --- a/.github/workflows/core_testmodels.yml +++ b/.github/workflows/core_testmodels.yml @@ -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 diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml index 921469bc4..0c2f61eac 100644 --- a/.github/workflows/core_tests.yml +++ b/.github/workflows/core_tests.yml @@ -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: Test Ribasim Core run: | pixi run test-ribasim-core-cov diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 622ba67f7..900bb84b1 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -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 diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index e20da5c90..1339fec97 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -20,7 +20,7 @@ jobs: with: pixi-version: "latest" - name: Prepare pixi - run: pixi run --environment=dev install-ci + run: pixi run install-ci - name: Run mypy on python/ribasim run: | pixi run mypy-ribasim-python diff --git a/.github/workflows/python_codegen.yml b/.github/workflows/python_codegen.yml index c14cbbd9f..511025dc2 100644 --- a/.github/workflows/python_codegen.yml +++ b/.github/workflows/python_codegen.yml @@ -20,7 +20,7 @@ jobs: with: pixi-version: "latest" - name: Prepare pixi - run: pixi run --environment=dev install-ci + run: pixi run install-ci - name: Test if codegen runs without errors run: pixi run codegen - name: Ensure that no code has been generated diff --git a/.github/workflows/qgis.yml b/.github/workflows/qgis.yml index 6130f4dd5..d5415ad82 100644 --- a/.github/workflows/qgis.yml +++ b/.github/workflows/qgis.yml @@ -27,7 +27,7 @@ jobs: pixi-version: "latest" - name: Prepare pixi run: | - pixi run --environment=dev install-ci + pixi run install-ci - name: Run tests run: pixi run test-ribasim-qgis-cov - name: Upload coverage to Codecov diff --git a/.teamcity/Ribasim/buildTypes/Ribasim_GenerateTestmodels.xml b/.teamcity/Ribasim/buildTypes/Ribasim_GenerateTestmodels.xml index c2945c1aa..96558689a 100644 --- a/.teamcity/Ribasim/buildTypes/Ribasim_GenerateTestmodels.xml +++ b/.teamcity/Ribasim/buildTypes/Ribasim_GenerateTestmodels.xml @@ -19,7 +19,7 @@ source /usr/share/Modules/init/bash module load pixi pixi --version -pixi run --environment=dev install-ci]]> +pixi run install-ci]]> diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasim.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasim.xml index d47affbe6..6a5089043 100644 --- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasim.xml +++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasim.xml @@ -17,7 +17,7 @@ source /usr/share/Modules/init/bash module load pixi pixi --version -pixi run --environment=dev install-ci]]> +pixi run install-ci]]> diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimBinaries.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimBinaries.xml index a49348465..c33f87f9b 100644 --- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimBinaries.xml +++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimBinaries.xml @@ -30,7 +30,7 @@ pixi run install-python]]> source /usr/share/Modules/init/bash module load pixi -pixi run --environment=dev install +pixi run install pixi run test-ribasim-api pixi run test-ribasim-cli]]> diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasim.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasim.xml index 9e8740b03..0a409a041 100644 --- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasim.xml +++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasim.xml @@ -16,7 +16,7 @@ +pixi run install-ci]]> diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimBinaries.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimBinaries.xml index 23a1e8ca0..749d1a6b3 100644 --- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimBinaries.xml +++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimBinaries.xml @@ -18,7 +18,7 @@ - diff --git a/docs/contribute/core.qmd b/docs/contribute/core.qmd index ef4e52fc3..e3e498dfe 100644 --- a/docs/contribute/core.qmd +++ b/docs/contribute/core.qmd @@ -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 , 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 diff --git a/docs/contribute/index.qmd b/docs/contribute/index.qmd index c35736711..2f787dee9 100644 --- a/docs/contribute/index.qmd +++ b/docs/contribute/index.qmd @@ -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. diff --git a/docs/contribute/qgis.qmd b/docs/contribute/qgis.qmd index afaae6eef..062214d42 100644 --- a/docs/contribute/qgis.qmd +++ b/docs/contribute/qgis.qmd @@ -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. @@ -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. diff --git a/open-vscode.bat b/open-vscode.bat index ae86837bf..078d226d0 100644 --- a/open-vscode.bat +++ b/open-vscode.bat @@ -1 +1 @@ -pixi run --environment=dev code . | exit +pixi run code . | exit diff --git a/pixi.toml b/pixi.toml index 050435358..37773c580 100644 --- a/pixi.toml +++ b/pixi.toml @@ -13,15 +13,6 @@ documentation = "https://deltares.github.io/Ribasim/" repository = "https://github.com/Deltares/Ribasim" [tasks] -# 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", -] } # 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" @@ -32,7 +23,6 @@ test-ribasim-api = "pytest --basetemp=python/ribasim_api/tests/temp --junitxml=r install-julia = "juliaup add 1.10.3 && juliaup default 1.10.3" install-pre-commit = "pre-commit install" install-ci = { depends_on = [ - "install-python", "install-julia", "update-registry-julia", @@ -184,6 +174,10 @@ xmipy = "*" xugrid = "*" xarray = "*" +[pypi-dependencies] +ribasim = { path = "python/ribasim", editable = true } +ribasim_api = { path = "python/ribasim_api", editable = true } +ribasim_testmodels = { path = "python/ribasim_testmodels", editable = true } [feature.dev.dependencies] build = "*"