Skip to content

Commit 697e0bf

Browse files
committed
remove trajan as core dep
1 parent e1043f3 commit 697e0bf

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

.binder/environment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ channels:
33
- conda-forge
44
dependencies:
55
- parcels
6+
- trajan

.github/ci/min-core-deps.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ dependencies:
2020
- pymbolic=2022.1
2121
- pytest=7.1
2222
- scipy=1.9
23-
- trajan=0.1
2423
- tqdm=4.64
2524
- xarray=2022.6
2625
- zarr=2.12

docs/installation.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ The steps below are the installation instructions for Linux, macOS and Windows.
1111

1212
**Step 1:** Install Anaconda's Miniconda following the steps at https://docs.anaconda.com/miniconda/. If you're on Linux /macOS, the following assumes that you installed Miniconda to your home directory.
1313

14-
**Step 2:** Start a terminal (Linux / macOS) or the Anaconda prompt (Windows). Activate the ``base`` environment of your Miniconda and create an environment containing Parcels, all its essential dependencies, and the nice-to-have cartopy and jupyter packages:
14+
**Step 2:** Start a terminal (Linux / macOS) or the Anaconda prompt (Windows). Activate the ``base`` environment of your Miniconda and create an environment containing Parcels, all its essential dependencies, ``trajan`` (a trajectory plotting dependency used in the notebooks) and the nice-to-have cartopy and jupyter packages:
1515

1616
.. code-block:: bash
1717
1818
conda activate base
19-
conda create -n parcels -c conda-forge parcels cartopy jupyter
19+
conda create -n parcels -c conda-forge parcels trajan cartopy jupyter
2020
2121
.. note::
2222

environment.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ dependencies:
1414
- pymbolic
1515
- scipy>=0.16.0
1616
- tqdm
17-
- trajan
1817
- xarray>=0.10.8
1918
- cftime>=1.3.1
2019
- dask>=2.0
2120
- scikit-learn
2221
- zarr>=2.11.0,!=2.18.0,<3
2322

23+
# Notebooks
24+
- trajan
25+
2426
# Testing
2527
- nbval
2628
- pytest

0 commit comments

Comments
 (0)