update environment configuration for ship_parcelsv4 and specify parcels dependency from parcels-v4 branch on github

j-atkins · j-atkins · commit fa1a04c1183d · 2025-10-21T16:18:08.000+02:00
diff --git a/environment.yml b/environment.yml
@@ -1,9 +1,10 @@
-name: ship
+name: ship_parcelsv4 #TODO: revert back to 'ship' before proper release...
 channels:
   - conda-forge
+  - https://repo.prefix.dev/parcels
 dependencies:
   - click
-  - parcels >3.1.0
+  - parcels =4.0.0alpha0
   - pyproj >= 3, < 4
   - sortedcontainers == 2.4.0
   - opensimplex == 0.4.5
@@ -15,6 +16,8 @@ dependencies:
   - openpyxl
   - yaspin
   - textual
+  # - pip:
+  #     - git+https://github.com/OceanParcels/parcels.git@v4-dev
 
   # linting
   - pre-commit
diff --git a/pyproject.toml b/pyproject.toml
@@ -26,7 +26,7 @@ classifiers = [
 ]
 dependencies = [
     "click",
-    "parcels >3.1.0",
+    "parcels @ git+https://github.com/OceanParcels/parcels.git@v4-dev",
     "pyproj >= 3, < 4",
     "sortedcontainers == 2.4.0",
     "opensimplex == 0.4.5",

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ classifiers = [`
`26`	`26`	`]`
`27`	`27`	`dependencies = [`
`28`	`28`	`"click",`
`29`		`- "parcels >3.1.0",`
	`29`	`+ "parcels @ git+https://github.com/OceanParcels/parcels.git@v4-dev",`
`30`	`30`	`"pyproj >= 3, < 4",`
`31`	`31`	`"sortedcontainers == 2.4.0",`
`32`	`32`	`"opensimplex == 0.4.5",`