version 0.5.1 - heavy visualization dependencies are not being instal…

…led by default
sentinel-hub · Jun 22, 2019 · 82239ad · 82239ad
1 parent 25174e5
commit 82239ad
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -72,7 +72,13 @@ shapely
 fiona
 ```
 
-One of dependecies of `eo-learn-mask` subpackage is `lightgbm` package. If having problems during installation please check [LightGBM installation guide](https://lightgbm.readthedocs.io/en/latest/Installation-Guide.html).
+One of dependecies of `eo-learn-mask` subpackage is `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).
+
+A part of subpackage `eo-learn-visualization` requires additional dependencies which don't get installed by default. Those can be installed with
+
+```bash
+pip install eo-learn-visualization[FULL]
+```
 
 ## Documentation
 

diff --git a/core/eolearn/core/__init__.py b/core/eolearn/core/__init__.py
@@ -14,4 +14,4 @@
 from .utilities import deep_eq, negate_mask, constant_pad, get_common_timestamps, bgr_to_rgb, FeatureParser
 
 
-__version__ = '0.5.0'
+__version__ = '0.5.1'
diff --git a/core/eolearn/core/eodata.py b/core/eolearn/core/eodata.py
@@ -810,7 +810,8 @@ def plot(self, feature, rgb=None, rgb_factor=3.5, vdims=None, timestamp_column='
         try:
             from eolearn.visualization import EOPatchVisualization
         except ImportError:
-            raise RuntimeError('Subpackage eo-learn-visualization has to be installed in order to use plot method')
+            raise RuntimeError('Subpackage eo-learn-visualization has to be installed with an option [FULL] in order '
+                               'to use plot method')
 
         vis = EOPatchVisualization(self, feature=feature, rgb=rgb, rgb_factor=rgb_factor, vdims=vdims,
                                    timestamp_column=timestamp_column, geometry_column=geometry_column,

diff --git a/docs/environment.yml b/docs/environment.yml
@@ -17,4 +17,4 @@ dependencies:
   - ./../io
   - ./../mask
   - ./../ml_tools
-  - ./../visualization
+  - ./../visualization[FULL]
diff --git a/install_all.py b/install_all.py
@@ -14,7 +14,7 @@
     'io',
     'mask',
     'ml_tools',
-    'visualization'
+    'visualization[FULL]'
 ]
 
 

diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@ def parse_requirements(file):
 setup(
     name='eo-learn',
     python_requires='>=3.5',
-    version='0.5.0',
+    version='0.5.1',
     description='Earth observation processing framework for machine learning in Python',
     long_description=get_long_description(),
     long_description_content_type='text/markdown',
@@ -32,14 +32,14 @@ def parse_requirements(file):
     packages=[],
     include_package_data=True,
     install_requires=[
-        'eo-learn-core>=0.5.0',
+        'eo-learn-core>=0.5.1',
         'eo-learn-coregistration>=0.5.0',
         'eo-learn-features>=0.5.0',
         'eo-learn-geometry>=0.5.0',
         'eo-learn-io>=0.5.0',
         'eo-learn-mask>=0.5.0',
         'eo-learn-ml-tools>=0.5.0',
-        'eo-learn-visualization>=0.5.0'
+        'eo-learn-visualization>=0.5.1'
     ],
     extras_require={
         'DEV': parse_requirements('requirements-dev.txt')

diff --git a/visualization/MANIFEST.in b/visualization/MANIFEST.in
@@ -1,2 +1,3 @@
 include requirements.txt
+include requirements-full.txt
 include LICENSE
diff --git a/visualization/eolearn/visualization/__init__.py b/visualization/eolearn/visualization/__init__.py
@@ -2,9 +2,12 @@
 A collection of visualization utilities
 """
 
-from .eopatch_visualization import EOPatchVisualization
 from .eoworkflow_visualization import EOWorkflowVisualization
 from .eoexecutor_visualization import EOExecutorVisualization
 
+try:
+    from .eopatch_visualization import EOPatchVisualization
+except ImportError:
+    pass
 
-__version__ = '0.5.0'
+__version__ = '0.5.1'
diff --git a/visualization/requirements-full.txt b/visualization/requirements-full.txt
@@ -0,0 +1,4 @@
+geoviews
+hvplot
+pyepsg
+xarray
diff --git a/visualization/requirements.txt b/visualization/requirements.txt
@@ -1,8 +1,4 @@
 eo-learn-core
-geoviews
-hvplot
-pyepsg
-xarray
 pydot
 graphviz>=0.10.1
 matplotlib

diff --git a/visualization/setup.py b/visualization/setup.py
@@ -41,5 +41,8 @@ def get_version():
     package_data={'eolearn': ['visualization/report_templates/report.html']},
     include_package_data=True,
     install_requires=parse_requirements("requirements.txt"),
+    extras_require={
+        'FULL': parse_requirements('requirements-full.txt')
+    },
     zip_safe=False
 )