Commit 0490413b authored by Carl Schaffer's avatar Carl Schaffer
Browse files

Merge branch 'dependency_fixes' into 'master'

Dependency fixes

See merge request !188
parents e881033b 18af2dc6
...@@ -2,16 +2,17 @@ import logging ...@@ -2,16 +2,17 @@ import logging
from datetime import datetime, timedelta from datetime import datetime, timedelta
import sqlalchemy as sa import sqlalchemy as sa
from sqlalchemy.exc import OperationalError
_logger = logging.getLogger(__name__) _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: try:
gdbs_engine = sa.create_engine(_gdbs_url) gdbs_engine = sa.create_engine(_gdbs_url)
gdbs_engine.connect() gdbs_engine.connect()
except: except OperationalError as e:
_logger.warning( _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?') f'Error: Could not connect to GREGOR database through {_gdbs_url}, are you on the KIS network?')
raise IOError('GDBS is not online') raise IOError(f'GDBS connection failed with {e}')
def query_gdbs(table, datetime, engine=gdbs_engine): def query_gdbs(table, datetime, engine=gdbs_engine):
......
...@@ -11,4 +11,6 @@ joblib ...@@ -11,4 +11,6 @@ joblib
scikit-learn==0.24.1 scikit-learn==0.24.1
urllib3 urllib3
astroplan astroplan
moviepy moviepy
\ No newline at end of file sqlalchemy
psycopg2-binary
\ No newline at end of file
...@@ -9,7 +9,7 @@ with open("README.md") as f: ...@@ -9,7 +9,7 @@ with open("README.md") as f:
README = f.read() README = f.read()
info = get_git_info(force=True) info = get_git_info(force=True)
version = "3.5.3" version = "3.5.4"
with open('requirements.txt', 'r') as req_file: with open('requirements.txt', 'r') as req_file:
requirements = [line.strip() for line in req_file] requirements = [line.strip() for line in req_file]
......
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