Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove trajan as core dependency #1833

Merged
merged 1 commit into from
Jan 30, 2025
Merged

Remove trajan as core dependency #1833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .binder/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ channels:
- conda-forge
dependencies:
- parcels
- trajan
1 change: 0 additions & 1 deletion .github/ci/min-core-deps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ dependencies:
- pymbolic=2022.1
- pytest=7.1
- scipy=1.9
- trajan=0.1
- tqdm=4.64
- xarray=2022.6
- zarr=2.12
4 changes: 2 additions & 2 deletions docs/installation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ The steps below are the installation instructions for Linux, macOS and Windows.

**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.

**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:
**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:

.. code-block:: bash

conda activate base
conda create -n parcels -c conda-forge parcels cartopy jupyter
conda create -n parcels -c conda-forge parcels trajan cartopy jupyter

.. note::

Expand Down
4 changes: 3 additions & 1 deletion environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@ dependencies:
- pymbolic
- scipy>=0.16.0
- tqdm
- trajan
- xarray>=0.10.8
- cftime>=1.3.1
- dask>=2.0
- scikit-learn
- zarr>=2.11.0,!=2.18.0,<3

# Notebooks
- trajan

# Testing
- nbval
- pytest
Expand Down
Loading