Commit eb9f2ae9 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Fixed faulty except.

parent 0dfb26e6
...@@ -32,7 +32,7 @@ test_gms_preprocessing: ...@@ -32,7 +32,7 @@ test_gms_preprocessing:
# - python setup.py install # - python setup.py install
# - cd ../../ # - cd ../../
# make tests # make tests
- pip install nested_dict openpyxl timeout_decorator python-redis-lock psutil # FIXME: remove as soon as runner is rebuilt - pip install nested_dict openpyxl timeout_decorator python-redis-lock redis psutil # FIXME: remove as soon as runner is rebuilt
- make nosetests - make nosetests
- make docs - make docs
artifacts: artifacts:
......
...@@ -3,6 +3,7 @@ __author__ = 'Daniel Scheffler' ...@@ -3,6 +3,7 @@ __author__ = 'Daniel Scheffler'
import time import time
from redis_lock import StrictRedis, Lock, NotAcquired from redis_lock import StrictRedis, Lock, NotAcquired
from redis.exceptions import ConnectionError as RedisConnectionError
import logging import logging
import functools import functools
...@@ -13,7 +14,7 @@ from ..options.config import GMS_config as CFG ...@@ -13,7 +14,7 @@ from ..options.config import GMS_config as CFG
try: try:
redis_conn = StrictRedis(host='localhost', db=0) redis_conn = StrictRedis(host='localhost', db=0)
redis_conn.keys() # may raise ConnectionError, e.g., if redis server is not installed or not running redis_conn.keys() # may raise ConnectionError, e.g., if redis server is not installed or not running
except ConnectionError: except RedisConnectionError:
redis_conn = None redis_conn = None
......
...@@ -18,4 +18,5 @@ nested_dict ...@@ -18,4 +18,5 @@ nested_dict
openpyxl openpyxl
timeout_decorator timeout_decorator
python-redis-lock python-redis-lock
redis
psutil psutil
...@@ -15,7 +15,7 @@ requirements = [ ...@@ -15,7 +15,7 @@ requirements = [
'matplotlib', 'numpy', 'scikit-learn', 'scipy', 'gdal', 'pyproj', 'shapely', 'ephem', 'pyorbital', 'dill', 'pytz', 'matplotlib', 'numpy', 'scikit-learn', 'scipy', 'gdal', 'pyproj', 'shapely', 'ephem', 'pyorbital', 'dill', 'pytz',
'pandas', 'numba', 'spectral>=0.16', 'geopandas', 'iso8601', 'pyinstrument', 'geoalchemy2', 'sqlalchemy', 'pandas', 'numba', 'spectral>=0.16', 'geopandas', 'iso8601', 'pyinstrument', 'geoalchemy2', 'sqlalchemy',
'psycopg2', 'py_tools_ds>=0.12.4', 'geoarray>=0.7.1', 'arosics>=0.6.6', 'six', 'tqdm', 'jsmin', 'cerberus', 'psycopg2', 'py_tools_ds>=0.12.4', 'geoarray>=0.7.1', 'arosics>=0.6.6', 'six', 'tqdm', 'jsmin', 'cerberus',
'nested_dict', 'openpyxl', 'timeout_decorator', 'python-redis-lock', 'psutil' 'nested_dict', 'openpyxl', 'timeout_decorator', 'python-redis-lock', 'redis', 'psutil'
# spectral<0.16 has some problems with writing signed integer 8bit data # spectral<0.16 has some problems with writing signed integer 8bit data
# fmask # conda install -c conda-forge python-fmask # fmask # conda install -c conda-forge python-fmask
# 'pyhdf', # conda install --yes -c conda-forge pyhdf # 'pyhdf', # conda install --yes -c conda-forge pyhdf
......
...@@ -75,6 +75,7 @@ dependencies: ...@@ -75,6 +75,7 @@ dependencies:
- openpyxl - openpyxl
- timeout_decorator - timeout_decorator
- python-redis-lock - python-redis-lock
- redis
- psutil - psutil
- py_tools_ds>=0.12.4 - py_tools_ds>=0.12.4
- geoarray>=0.7.0 - geoarray>=0.7.0
......
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