Skip to content

Commit 1a046a3

Browse files
committed
Revert "Update Pixi parcels installation method back to pypi (#2326)"
This reverts commit 4330de3.
1 parent 58cdd61 commit 1a046a3

File tree

1 file changed

+13
-17
lines changed

1 file changed

+13
-17
lines changed

pixi.toml

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
[workspace]
22
name = "Parcels"
3+
preview = ["pixi-build"]
34
channels = ["conda-forge"]
45
platforms = ["win-64", "linux-64", "osx-64", "osx-arm64"]
56

6-
# TODO: Re-enable pixi-build once https://github.com/prefix-dev/pixi-build-backends/issues/411 is fixed, and remove pypi install of Parcels
7-
# preview = ["pixi-build"]
8-
# [package]
9-
# name = "parcels"
10-
# 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.
11-
# license = "MIT" # can remove this once https://github.com/prefix-dev/pixi-build-backends/issues/397 is resolved
12-
#
13-
# [package.build]
14-
# backend = { name = "pixi-build-python", version = "==0.4.0" }
15-
#
16-
# [package.host-dependencies]
17-
# setuptools = "*"
18-
# setuptools_scm = "*"
7+
[package]
8+
name = "parcels"
9+
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.
10+
license = "MIT" # can remove this once https://github.com/prefix-dev/pixi-build-backends/issues/397 is resolved
11+
12+
[package.build]
13+
backend = { name = "pixi-build-python", version = "==0.4.0" }
14+
15+
[package.host-dependencies]
16+
setuptools = "*"
17+
setuptools_scm = "*"
1918

2019
[environments]
2120
test-latest = { features = ["test"], solve-group = "test" }
@@ -29,7 +28,7 @@ pre-commit = { features = ["pre-commit"], no-default-feature = true }
2928

3029
[dependencies] # keep section in sync with pyproject.toml dependencies
3130
python = ">=3.11"
32-
# parcels = { path = "." }
31+
parcels = { path = "." }
3332
netcdf4 = ">=1.7.2"
3433
numpy = ">=2.1.0"
3534
tqdm = ">=4.50.0"
@@ -42,9 +41,6 @@ cf_xarray = ">=0.8.6"
4241
cftime = ">=1.6.3"
4342
pooch = ">=1.8.0"
4443

45-
[pypi-dependencies]
46-
parcels = { path = ".", editable = true }
47-
4844
[feature.minimum.dependencies]
4945
python = "==3.11"
5046
netcdf4 = "==1.7.2"

0 commit comments

Comments
 (0)