From 697e0bfb1eedef14add6d16a1a5d60a4535e914d Mon Sep 17 00:00:00 2001 From: Vecko <36369090+VeckoTheGecko@users.noreply.github.com> Date: Tue, 28 Jan 2025 17:04:17 +0100 Subject: [PATCH] remove trajan as core dep --- .binder/environment.yml | 1 + .github/ci/min-core-deps.yml | 1 - docs/installation.rst | 4 ++-- environment.yml | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.binder/environment.yml b/.binder/environment.yml index b223d3193..1a59c7771 100644 --- a/.binder/environment.yml +++ b/.binder/environment.yml @@ -3,3 +3,4 @@ channels: - conda-forge dependencies: - parcels + - trajan diff --git a/.github/ci/min-core-deps.yml b/.github/ci/min-core-deps.yml index ce9d2a5a2..25eec60d9 100644 --- a/.github/ci/min-core-deps.yml +++ b/.github/ci/min-core-deps.yml @@ -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 diff --git a/docs/installation.rst b/docs/installation.rst index 5e06e3e4a..f5775847a 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -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:: diff --git a/environment.yml b/environment.yml index 02c4689ea..04eaad6b9 100644 --- a/environment.yml +++ b/environment.yml @@ -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