From 1a046a3c40bc5091ccc996c9ea736e86472a5ae0 Mon Sep 17 00:00:00 2001 From: Vecko <36369090+VeckoTheGecko@users.noreply.github.com> Date: Thu, 23 Oct 2025 08:26:57 +0200 Subject: [PATCH] Revert "Update Pixi parcels installation method back to pypi (#2326)" This reverts commit 4330de33884f1f1f4136bc21cd759d6c045c2438. --- pixi.toml | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/pixi.toml b/pixi.toml index 26c6771f8e..561b54451d 100644 --- a/pixi.toml +++ b/pixi.toml @@ -1,21 +1,20 @@ [workspace] name = "Parcels" +preview = ["pixi-build"] channels = ["conda-forge"] platforms = ["win-64", "linux-64", "osx-64", "osx-arm64"] -# TODO: Re-enable pixi-build once https://github.com/prefix-dev/pixi-build-backends/issues/411 is fixed, and remove pypi install of Parcels -# preview = ["pixi-build"] -# [package] -# name = "parcels" -# version = "dynamic" # dynamic versioning needs better support in pixi https://github.com/prefix-dev/pixi/issues/2923#issuecomment-2598460666 . Putting `version = "dynamic"` here for now until pixi recommends something else. -# license = "MIT" # can remove this once https://github.com/prefix-dev/pixi-build-backends/issues/397 is resolved -# -# [package.build] -# backend = { name = "pixi-build-python", version = "==0.4.0" } -# -# [package.host-dependencies] -# setuptools = "*" -# setuptools_scm = "*" +[package] +name = "parcels" +version = "dynamic" # dynamic versioning needs better support in pixi https://github.com/prefix-dev/pixi/issues/2923#issuecomment-2598460666 . Putting `version = "dynamic"` here for now until pixi recommends something else. +license = "MIT" # can remove this once https://github.com/prefix-dev/pixi-build-backends/issues/397 is resolved + +[package.build] +backend = { name = "pixi-build-python", version = "==0.4.0" } + +[package.host-dependencies] +setuptools = "*" +setuptools_scm = "*" [environments] test-latest = { features = ["test"], solve-group = "test" } @@ -29,7 +28,7 @@ pre-commit = { features = ["pre-commit"], no-default-feature = true } [dependencies] # keep section in sync with pyproject.toml dependencies python = ">=3.11" -# parcels = { path = "." } +parcels = { path = "." } netcdf4 = ">=1.7.2" numpy = ">=2.1.0" tqdm = ">=4.50.0" @@ -42,9 +41,6 @@ cf_xarray = ">=0.8.6" cftime = ">=1.6.3" pooch = ">=1.8.0" -[pypi-dependencies] -parcels = { path = ".", editable = true } - [feature.minimum.dependencies] python = "==3.11" netcdf4 = "==1.7.2"