Merge branch 'dependency_fixes' into 'master'

Dependency fixes

See merge request !188

kis_tools/gdbs/query_gdbs.py

@@ -2,16 +2,17 @@ import logging
 from datetime import datetime, timedelta
 
 import sqlalchemy as sa
+from sqlalchemy.exc import OperationalError
 
 _logger = logging.getLogger(__name__)
-_gdbs_url = 'postgresql://readuser:logit@gdbs.tt.iac.es:5432/gregor'
+_gdbs_url = 'postgresql://readuser:logit@gdbbs.tt.iac.es:5432/gregor'
 try:
     gdbs_engine = sa.create_engine(_gdbs_url)
     gdbs_engine.connect()
-except:
+except OperationalError as e:
     _logger.warning(
-        f'Error: Could not connect to GREGOR database through {_gdbs_url}, are you on the KIS network and is the ssh tunnel running?')
-    raise IOError('GDBS is not online')
+        f'Error: Could not connect to GREGOR database through {_gdbs_url}, are you on the KIS network?')
+    raise IOError(f'GDBS connection failed with {e}')
 
 
 def query_gdbs(table, datetime, engine=gdbs_engine):

requirements.txt

@@ -11,4 +11,6 @@ joblib
 scikit-learn==0.24.1
 urllib3
 astroplan
-moviepy
+moviepy
\ No newline at end of file
+sqlalchemy
+psycopg2-binary
\ No newline at end of file

setup.py

@@ -9,7 +9,7 @@ with open("README.md") as f:
     README = f.read()
 info = get_git_info(force=True)
 
-version = "3.5.3"
+version = "3.5.4"
 with open('requirements.txt', 'r') as req_file:
     requirements = [line.strip() for line in req_file]