Merge pull request #564 from 12rambau/main

🚀 2.10.1 → 2.10.2

.cz.yaml

@@ -3,7 +3,7 @@ commitizen:
   changelog_incremental: true
   tag_format: v_$major.$minor.$patch$prerelease
   update_changelog_on_bump: true
-  version: 2.10.1
+  version: 2.10.2
   version_files:
   - setup.py:version
   - sepal_ui/__init__.py:__version__

CHANGELOG.md

@@ -1,3 +1,10 @@
+## v_2.10.2 (2022-07-28)
+
+### Fix
+
+- use appropiate error
+- lazy import of localtileserver
+
 ## v_2.10.1 (2022-07-25)
 
 ### Fix

README.rst

@@ -7,8 +7,8 @@ Sepal_ui
     :target: https://opensource.org/licenses/MIT
     :alt: License: MIT
 
-.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.6467835.svg
-   :target: https://doi.org/10.5281/zenodo.6467835
+.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.6467834.svg
+   :target: https://doi.org/10.5281/zenodo.6467834
    :alt: Citation
 
 .. image:: https://badge.fury.io/py/sepal-ui.svg

docs/source/_static/switcher.json

@@ -5,13 +5,13 @@
         "url": "https://sepal-ui.readthedocs.io/en/latest/"
     },
     {
-        "name": "2.10.0 (stable)", 
-        "version": "v_2.10.0",
-        "url": "https://sepal-ui.readthedocs.io/en/v_2.10.0"
+        "name": "2.10.1 (stable)", 
+        "version": "v_2.10.1",
+        "url": "https://sepal-ui.readthedocs.io/en/v_2.10.1"
     }
     {
         "name": "2.9.4", 
         "version": "v_2.9.4",
         "url": "https://sepal-ui.readthedocs.io/en/v_2.9.4"
     }
-]
+]

sepal_ui/__init__.py

@@ -5,7 +5,7 @@
 
 __author__ = """Pierrick Rambaud"""
 __email__ = "[email protected]"
-__version__ = "2.10.1"
+__version__ = "2.10.2"
 
 color = SepalColor()
 'color: the colors of sepal. members are in the following list: "main, darker, bg, primary, accent, secondary, success, info, warning, error, menu". They will render according to the selected theme.'

sepal_ui/mapping/sepal_map.py

@@ -23,7 +23,6 @@
 import rioxarray
 from deprecated.sphinx import deprecated
 from haversine import haversine
-from localtileserver import TileClient, get_leaflet_tile_layer
 from matplotlib import colorbar
 from matplotlib import colors as mpc
 from rasterio.crs import CRS
@@ -287,6 +286,15 @@ def add_raster(
             (BoundTileLayer) the local tile layer embeding the raster member (to be used with other tools of sepal-ui)
         """
 
+        # lazy import of localtileserver to avoid conflicts with GDAL
+        # environments
+        try:
+            from localtileserver import TileClient, get_leaflet_tile_layer  # noqa: E402
+        except ModuleNotFoundError:
+            raise ModuleNotFoundError(
+                "Your environment is not compatible with localtileserver, please check https://localtileserver.banesullivan.com/installation/index.html for more information"
+            )
+
         # add the localtilelayer path to the environment
         # if the value is already set we don't change anything
         os.environ["LOCALTILESERVER_CLIENT_PREFIX"] = os.environ.pop(

setup.py

@@ -4,7 +4,7 @@
 from setuptools import setup
 from setuptools.command.develop import develop
 
-version = "2.10.1"
+version = "2.10.2"
 
 DESCRIPTION = "Wrapper for ipyvuetify widgets to unify the display of voila dashboards in SEPAL platform"
 LONG_DESCRIPTION = open("README.rst").read()