diff --git a/pixi.lock b/pixi.lock index 17722356a..723dc335f 100644 --- a/pixi.lock +++ b/pixi.lock @@ -331,6 +331,9 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/zipp-3.17.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/zlib-1.2.13-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.5-hfc55251_0.conda + - pypi: python/ribasim + - pypi: python/ribasim_api + - pypi: python/ribasim_testmodels osx-64: - conda: https://conda.anaconda.org/conda-forge/noarch/annotated-types-0.6.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/attrs-23.2.0-pyh71513ae_0.conda @@ -598,6 +601,9 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/zipp-3.17.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/zlib-1.2.13-h8a1eda9_5.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/zstd-1.5.5-h829000d_0.conda + - pypi: python/ribasim + - pypi: python/ribasim_api + - pypi: python/ribasim_testmodels osx-arm64: - conda: https://conda.anaconda.org/conda-forge/noarch/annotated-types-0.6.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/attrs-23.2.0-pyh71513ae_0.conda @@ -865,6 +871,9 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/zipp-3.17.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/zlib-1.2.13-h53f4e23_5.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/zstd-1.5.5-h4f39d0f_0.conda + - pypi: python/ribasim + - pypi: python/ribasim_api + - pypi: python/ribasim_testmodels win-64: - conda: https://conda.anaconda.org/conda-forge/noarch/annotated-types-0.6.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/attrs-23.2.0-pyh71513ae_0.conda @@ -1140,6 +1149,9 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/zipp-3.17.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/win-64/zlib-1.2.13-hcfcfb64_5.conda - conda: https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.5-h12be248_0.conda + - pypi: python/ribasim + - pypi: python/ribasim_api + - pypi: python/ribasim_testmodels dev: channels: - url: https://conda.anaconda.org/conda-forge/ @@ -1646,6 +1658,9 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/zipp-3.17.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/zlib-1.2.13-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.5-hfc55251_0.conda + - pypi: python/ribasim + - pypi: python/ribasim_api + - pypi: python/ribasim_testmodels osx-64: - conda: https://conda.anaconda.org/conda-forge/noarch/annotated-types-0.6.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/anyio-4.3.0-pyhd8ed1ab_0.conda @@ -2106,6 +2121,9 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/zipp-3.17.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/zlib-1.2.13-h8a1eda9_5.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/zstd-1.5.5-h829000d_0.conda + - pypi: python/ribasim + - pypi: python/ribasim_api + - pypi: python/ribasim_testmodels osx-arm64: - conda: https://conda.anaconda.org/conda-forge/noarch/annotated-types-0.6.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/anyio-4.3.0-pyhd8ed1ab_0.conda @@ -2566,6 +2584,9 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/zipp-3.17.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/zlib-1.2.13-h53f4e23_5.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/zstd-1.5.5-h4f39d0f_0.conda + - pypi: python/ribasim + - pypi: python/ribasim_api + - pypi: python/ribasim_testmodels win-64: - conda: https://conda.anaconda.org/conda-forge/noarch/annotated-types-0.6.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/anyio-4.3.0-pyhd8ed1ab_0.conda @@ -3020,6 +3041,9 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/zipp-3.17.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/win-64/zlib-1.2.13-hcfcfb64_5.conda - conda: https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.5-h12be248_0.conda + - pypi: python/ribasim + - pypi: python/ribasim_api + - pypi: python/ribasim_testmodels py310: channels: - url: https://conda.anaconda.org/conda-forge/ @@ -5661,6 +5685,9 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/zipp-3.17.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/zlib-1.2.13-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.5-hfc55251_0.conda + - pypi: python/ribasim + - pypi: python/ribasim_api + - pypi: python/ribasim_testmodels osx-64: - conda: https://conda.anaconda.org/conda-forge/noarch/annotated-types-0.6.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/attrs-23.2.0-pyh71513ae_0.conda @@ -5928,6 +5955,9 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/zipp-3.17.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/zlib-1.2.13-h8a1eda9_5.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/zstd-1.5.5-h829000d_0.conda + - pypi: python/ribasim + - pypi: python/ribasim_api + - pypi: python/ribasim_testmodels osx-arm64: - conda: https://conda.anaconda.org/conda-forge/noarch/annotated-types-0.6.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/attrs-23.2.0-pyh71513ae_0.conda @@ -6195,6 +6225,9 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/zipp-3.17.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/zlib-1.2.13-h53f4e23_5.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/zstd-1.5.5-h4f39d0f_0.conda + - pypi: python/ribasim + - pypi: python/ribasim_api + - pypi: python/ribasim_testmodels win-64: - conda: https://conda.anaconda.org/conda-forge/noarch/annotated-types-0.6.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/attrs-23.2.0-pyh71513ae_0.conda @@ -6470,6 +6503,9 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/zipp-3.17.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/win-64/zlib-1.2.13-hcfcfb64_5.conda - conda: https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.5-h12be248_0.conda + - pypi: python/ribasim + - pypi: python/ribasim_api + - pypi: python/ribasim_testmodels packages: - kind: conda name: _libgcc_mutex diff --git a/pixi.toml b/pixi.toml index 5d5594a68..e3d437b2b 100644 --- a/pixi.toml +++ b/pixi.toml @@ -13,16 +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,12 +22,7 @@ test-ribasim-api = "pytest --basetemp=python/ribasim_api/tests/temp --junitxml=r # Installation 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-julia", - "update-registry-julia", - -] } +install-ci = { depends_on = ["install-julia", "update-registry-julia"] } install = { depends_on = [ "install-ci", "install-qgis-plugins", @@ -175,9 +160,9 @@ xugrid = "*" xarray = "*" [pypi-dependencies] -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 } +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 = "*"