Merge branch 'GDAL-numpy' into '2020'

Fix for issue #32

See merge request hps-public/easybuild-repository!392

Golden_Repo/g/GDAL/GDAL-3.1.2-gpsmpi-2020-Python-3.8.5.eb

@@ -24,6 +24,7 @@ patches = ['GDAL-3.0.0_fix-python-CC-CXX.patch']
 
 dependencies = [
     ('Python', '3.8.5'),
+    ('SciPy-Stack', '2020', versionsuffix, ('gcccoremkl', '9.3.0-2020.2.254')),
     ('netCDF', '4.7.4'),
     ('expat', '2.2.9'),
     ('GEOS', '3.8.1', versionsuffix),
@@ -39,7 +40,6 @@ dependencies = [
     ('libgeotiff', '1.6.0'),
     ('HDF5', '1.10.6'),
     ('OpenJPEG', '2.3.1'),
-    # ('JasPer', '2.0.19'), #  openjpeg took over
 ]
 
 configopts = ' --with-python=$EBROOTPYTHON/bin/python'
@@ -57,9 +57,10 @@ configopts += ' --with-proj=$EBROOTPROJ'
 configopts += ' --with-libgeotiff=$EBROOTLIBGEOTIFF'
 configopts += ' --without-hdf4 --with-hdf5=$EBROOTHDF5'
 configopts += ' --with-openjpeg=$EBROOTOPENJPEG'
-# configopts += ' --with-jasper=$EBROOTJASPER'
 configopts += ' --without-jasper'
 
+prebuildopts = 'export LDSHARED="$CC -shared" && '
+
 modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages'}
 
 sanity_check_paths = {
@@ -67,6 +68,6 @@ sanity_check_paths = {
     'dirs': ['bin', 'include', 'lib/python%(pyshortver)s/site-packages']
 }
 
-sanity_check_commands = ["python -c 'import gdal'"]
+sanity_check_commands = ["python -c 'import gdal'", "python -c 'from osgeo import gdal_array'"]
 
 moduleclass = 'data'

Golden_Repo/g/GDAL/GDAL-3.1.2-ipsmpi-2020-Python-3.8.5.eb

@@ -24,6 +24,7 @@ patches = ['GDAL-3.0.0_fix-python-CC-CXX.patch']
 
 dependencies = [
     ('Python', '3.8.5'),
+    ('SciPy-Stack', '2020', versionsuffix, ('gcccoremkl', '9.3.0-2020.2.254')),
     ('netCDF', '4.7.4'),
     ('expat', '2.2.9'),
     ('GEOS', '3.8.1', versionsuffix),
@@ -39,7 +40,6 @@ dependencies = [
     ('libgeotiff', '1.6.0'),
     ('HDF5', '1.10.6'),
     ('OpenJPEG', '2.3.1'),
-    # ('JasPer', '2.0.19'), #  openjpeg took over
 ]
 
 configopts = ' --with-python=$EBROOTPYTHON/bin/python'
@@ -57,7 +57,6 @@ configopts += ' --with-proj=$EBROOTPROJ'
 configopts += ' --with-libgeotiff=$EBROOTLIBGEOTIFF'
 configopts += ' --without-hdf4 --with-hdf5=$EBROOTHDF5'
 configopts += ' --with-openjpeg=$EBROOTOPENJPEG'
-# configopts += ' --with-jasper=$EBROOTJASPER'
 configopts += ' --without-jasper'
 
 prebuildopts = 'export LDSHARED="$CC -shared" && '
@@ -69,6 +68,6 @@ sanity_check_paths = {
     'dirs': ['bin', 'include', 'lib/python%(pyshortver)s/site-packages']
 }
 
-sanity_check_commands = ["python -c 'import gdal'"]
+sanity_check_commands = ["python -c 'import gdal'", "python -c 'from osgeo import gdal_array'"]
 
 moduleclass = 'data'