Merge pull request #49 from ESA-PhiLab/develop

Develop

ost/generic/ard_to_ts.py

@@ -11,9 +11,10 @@
 try:
     import gdal
 except ModuleNotFoundError as e:
-    from osgeo import gdal
-except ModuleNotFoundError as e:
-    raise e
+    try:
+        from osgeo import gdal
+    except ModuleNotFoundError:
+        raise e
 
 from ost.generic.common_wrappers import create_stack, mt_speckle_filter
 from ost.helpers import raster as ras, helpers as h

ost/generic/mosaic.py

@@ -13,9 +13,10 @@
 try:
     import gdal
 except ModuleNotFoundError as e:
-    from osgeo import gdal
-except ModuleNotFoundError as e:
-    raise e
+    try:
+        from osgeo import gdal
+    except ModuleNotFoundError:
+        raise e
 
 from ost.helpers import vector as vec
 from ost.helpers import helpers as h

ost/generic/ts_ls_mask.py

@@ -18,7 +18,7 @@
     except ModuleNotFoundError:
         raise e
 
-from ost.helpers import raster as ras, vector as vec
+from ost.helpers import vector as vec
 
 logger = logging.getLogger(__name__)
 

ost/helpers/db.py

@@ -16,9 +16,10 @@
 try:
     import ogr
 except ModuleNotFoundError as e:
-    from osgeo import ogr
-except ModuleNotFoundError as e:
-    raise e
+    try:
+        from osgeo import ogr
+    except ModuleNotFoundError:
+        raise e
 
 from ost.helpers.vector import get_proj4, reproject_geometry
 

ost/helpers/helpers.py

@@ -19,10 +19,10 @@
 try:
     import gdal
 except ModuleNotFoundError as e:
-    from osgeo import gdal
-except ModuleNotFoundError as e:
-    raise e
-
+    try:
+        from osgeo import gdal
+    except ModuleNotFoundError:
+        raise e
 
 logger = logging.getLogger(__name__)
 

ost/helpers/raster.py

@@ -15,9 +15,10 @@
 try:
     import gdal
 except ModuleNotFoundError as e:
-    from osgeo import gdal
-except ModuleNotFoundError as e:
-    raise e
+    try:
+        from osgeo import gdal
+    except ModuleNotFoundError:
+        raise e
 
 import fiona
 import imageio

ost/helpers/vector.py

@@ -3,12 +3,19 @@
 from functools import partial
 from pathlib import Path
 
-import osr
-import warnings
 import pyproj
 import geopandas as gpd
 import logging
 
+# osgeo safe imports
+try:
+    import osr
+except ModuleNotFoundError as e:
+    try:
+        from osgeo import osr
+    except ModuleNotFoundError:
+        raise e
+
 try:
     import ogr
 except ModuleNotFoundError as e:

requirements.txt

@@ -1,20 +1,20 @@
 descartes
-fiona>=1.8
-gdal>=3
+fiona
+gdal>=2
 godale
 geopandas>=0.8
-jupyterlab>=1.2
+jupyterlab
 matplotlib
-numpy>=1.19
-pandas>=1.1
+numpy
+pandas
 psycopg2-binary
-rasterio>=1.1
-requests>=2.2
-scipy>=1.5
+rasterio
+requests
+scipy
 shapely
-tqdm>=4.51
+tqdm
 imageio
-rtree>=0.9
+rtree
 retrying
 pytest
 pytest-cov