Also lazy load numpy

qgis · Nov 17, 2019 · 6337ed6 · 6337ed6
1 parent a4052f9
commit 6337ed6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/python/plugins/processing/algs/qgis/HypsometricCurves.py b/python/plugins/processing/algs/qgis/HypsometricCurves.py
@@ -22,7 +22,6 @@
 __copyright__ = '(C) 2014, Alexander Bruy'
 
 import os
-import numpy
 import csv
 
 from osgeo import gdal, ogr, osr
@@ -79,6 +78,11 @@ def displayName(self):
         return self.tr('Hypsometric curves')
 
     def processAlgorithm(self, parameters, context, feedback):
+        try:
+            import numpy
+        except ImportError:
+            raise QgsProcessingException(self.tr('This algorithm requires the Python “numpy” library. Please install this library and try again.'))
+
         raster_layer = self.parameterAsRasterLayer(parameters, self.INPUT_DEM, context)
         target_crs = raster_layer.crs()
         rasterPath = raster_layer.source()

diff --git a/python/plugins/processing/algs/qgis/PolarPlot.py b/python/plugins/processing/algs/qgis/PolarPlot.py
@@ -74,7 +74,10 @@ def processAlgorithm(self, parameters, context, feedback):
         except ImportError:
             raise QgsProcessingException(self.tr('This algorithm requires the Python “plotly” library. Please install this library and try again.'))
 
-        import numpy as np
+        try:
+            import numpy as np
+        except ImportError:
+            raise QgsProcessingException(self.tr('This algorithm requires the Python “numpy” library. Please install this library and try again.'))
 
         source = self.parameterAsSource(parameters, self.INPUT, context)
         if source is None:

diff --git a/python/plugins/processing/tools/raster.py b/python/plugins/processing/tools/raster.py
@@ -21,10 +21,8 @@
 __date__ = 'February 2013'
 __copyright__ = '(C) 2013, Victor Olaya  and Alexander Bruy'
 
-import os
 import struct
 
-import numpy
 from osgeo import gdal
 
 from qgis.core import QgsProcessingException