Commit 8e961042 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Deactivated sicor check within GMSEnvironment._check_nonpip_packages() as this...


Deactivated sicor check within GMSEnvironment._check_nonpip_packages() as this is now installed via conda-forge.
Signed-off-by: Daniel Scheffler's avatarDaniel Scheffler <danschef@gfz-potsdam.de>
parent 27f51f5e
......@@ -102,14 +102,14 @@ class GMSEnvironment(object):
"be processed! For Anaconda, run 'conda install --yes -c conda-forge pyhdf' to fix that!"
self.logger.warning(MissingNonPipLibraryWarning(msg))
# 'sicor', # pip install git+https://gitext.gfz-potsdam.de/hollstei/sicor.git
try:
# noinspection PyUnresolvedReferences
import sicor # noqa F401 unused
except ImportError:
msg = "The library 'sicor' has not been installed automatically because installation requires login " \
"credentials. See installation instrucions here: https://gitext.gfz-potsdam.de/EnMAP/sicor"
self.logger.warning(MissingNonPipLibraryWarning(msg))
# # 'sicor', # pip install git+https://gitext.gfz-potsdam.de/hollstei/sicor.git
# try:
# # noinspection PyUnresolvedReferences
# import sicor # noqa F401 unused
# except ImportError:
# msg = "The library 'sicor' has not been installed automatically because installation requires login " \
# "credentials. See installation instrucions here: https://gitext.gfz-potsdam.de/EnMAP/sicor"
# self.logger.warning(MissingNonPipLibraryWarning(msg))
def check_dependencies(self):
# pyLibs = []
......@@ -151,7 +151,7 @@ class GMSEnvironment(object):
@staticmethod
def ensure_properly_activated_GDAL():
if 'conda' in sys.version:
conda_rootdir = subprocess.check_output('conda info --root', shell=True).decode('utf-8')[:-1]
conda_rootdir = sys.prefix
gdal_data_dir = os.path.join(conda_rootdir, 'share', 'gdal')
# GDAL_DATA
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment