Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,11 @@ jobs:
matrix:
os: [ubuntu] #, mac, windows] # TODO v4: Re-enable windows and mac
test-subfolder: ["/"]
python-version: ["3.13"]
python-version: ["3.12"]
include:
- os: ubuntu
python-version: "3.11"
test-subfolder: "/"
- os: ubuntu
python-version: "3.12"
test-subfolder: "/"
- os: ubuntu
python-version: "3.12"
test-subfolder: "/v4"
Expand All @@ -52,7 +49,6 @@ jobs:
uses: codecov/codecov-action@v5.3.1
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
if: matrix.python-version == '3.13'
with:
flags: unit-tests
- name: Upload test results
Expand All @@ -68,7 +64,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu] #, mac, windows] # TODO v4: Re-enable windows and mac
python-version: ["3.13"]
python-version: ["3.12"]
include:
- os: ubuntu
python-version: "3.11"
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: parcels
channels:
- conda-forge
dependencies: #! Keep in sync with [tool.pixi.dependencies] in pyproject.toml
- python>=3.11
- python>=3.11, <3.13
- ffmpeg>=3.2.3
- jupyter
- matplotlib-base>=2.0.2
Expand Down
2 changes: 1 addition & 1 deletion parcels/field.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def __init__(
self,
name: str,
data: xr.DataArray | ux.UxDataArray,
grid: ux.UxGrid | None = None, # TODO Nick : Once parcels.Grid class is added, allow for it to be passed here
grid: ux.Grid | None = None, # TODO Nick : Once parcels.Grid class is added, allow for it to be passed here
mesh_type: Mesh = "flat",
interp_method: Callable | None = None,
allow_time_extrapolation: bool | None = None,
Expand Down
1 change: 0 additions & 1 deletion parcels/fieldset.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ def add_field(self, field: Field, name: str | None = None):
raise RuntimeError(f"FieldSet already has a Field with name '{name}'")
else:
setattr(self, name, field)
self._gridset_size += 1
self._fieldnames.append(name)

def add_constant_field(self, name: str, value, mesh: Mesh = "flat"):
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = "Framework for Lagrangian tracking of virtual ocean particles in t
readme = "README.md"
dynamic = ["version"]
authors = [{name = "oceanparcels.org team"}]
requires-python = ">=3.11"
requires-python = ">=3.11,<3.13"
license = {file = "LICENSE.md"}
classifiers = [
"License :: OSI Approved :: MIT License",
Expand Down
Loading