From 085313c3dce621691e68d6771797a8fa0b47d0f2 Mon Sep 17 00:00:00 2001 From: Matic Lubej Date: Wed, 6 Sep 2023 16:07:32 +0200 Subject: [PATCH] switch to single extra extra --- README.md | 7 ++----- eolearn/features/extra/__init__.py | 2 +- eolearn/mask/extra/__init__.py | 2 +- pyproject.toml | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 6155f86c..7e50cea6 100644 --- a/README.md +++ b/README.md @@ -81,8 +81,6 @@ shapely fiona ``` -One of the `[MASK_EXTRA]` dependencies is the `lightgbm` package. On Windows it requires 64 bit Python distribution. If having problems during installation please check [LightGBM installation guide](https://lightgbm.readthedocs.io/en/latest/Installation-Guide.html). - ### PyPI distribution `eo-learn` is available on PyPI and can be installed with: @@ -94,7 +92,7 @@ pip install eo-learn For some modules there are extra dependencies available, related to specific tasks. These were kept separate in order to keep the `eo-learn` installation light. You can install these with, e.g.: ```bash -pip install "eo-learn[MASK_EXTRA]" +pip install "eo-learn[EXTRA]" pip install "eo-learn[VISUALIZATION]" ``` @@ -102,8 +100,7 @@ The full list (including their descriptions) is available here: - `RAY` for installing ray and its dependencies - `ZARR` for installing the zarr functionality for chunked timestamp saving/loading -- `FEATURES_EXTRA` for installing interpolation- and clustering-specific dependencies -- `MASK_EXTRA` for installing `s2cloudless` for cloud masking +- `EXTRA` for installing interpolation- and clustering-specific dependencies, or for installing `s2cloudless` in cloud masking - `VISUALIZATION` for using plotting libraries and utilities - `FULL` for installing all dependencies described so far - `DOCS` for developers, dependencies for building documentation diff --git a/eolearn/features/extra/__init__.py b/eolearn/features/extra/__init__.py index 0f1b579e..d4bee5ae 100644 --- a/eolearn/features/extra/__init__.py +++ b/eolearn/features/extra/__init__.py @@ -1,4 +1,4 @@ """ -A collection of EOTasks with non-standard dependencies. Use the extra `FEATURES_EXTRA` to install dependencies or +A collection of EOTasks with non-standard dependencies. Use the extra `[EXTRA]` to install dependencies or install the module-specific dependencies by hand. """ diff --git a/eolearn/mask/extra/__init__.py b/eolearn/mask/extra/__init__.py index 53be783c..d4bee5ae 100644 --- a/eolearn/mask/extra/__init__.py +++ b/eolearn/mask/extra/__init__.py @@ -1,4 +1,4 @@ """ -A collection of EOTasks with non-standard dependencies. Use the extra `MASK_EXTRA` to install dependencies or +A collection of EOTasks with non-standard dependencies. Use the extra `[EXTRA]` to install dependencies or install the module-specific dependencies by hand. """ diff --git a/pyproject.toml b/pyproject.toml index e51fcb84..51792cee 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,7 +62,7 @@ dependencies = [ [project.optional-dependencies] -full = ["eo-learn[RAY,ZARR,FEATURES_EXTRA,MASK_EXTRA,VISUALIZATION]"] +full = ["eo-learn[RAY,ZARR,EXTRA,VISUALIZATION]"] ray = ["ray[default]"] zarr = ["s3fs", "zarr"] extra = ["numba>=0.53.0", "scikit-learn", "scipy", "s2cloudless"]