...
 
Commits (5)
IMAGE_TAG=0.16-beta
IMAGE_TAG=0.17-beta
......@@ -10,9 +10,7 @@ stages :
tags:
- dind
stage : build
rules:
- when: manual
- changes:
only-changes:
- Dockerfile
- .env
services:
......
......@@ -6,6 +6,14 @@ RUN apt-get update -y && \
pip3 install --upgrade pip setuptools wheel && \
true
# Pre-install important pip packages (for speedup during the application setup on developper machine)
RUN set -eux ; \
pip3 install --upgrade pip setuptools wheel setuptools_scm && \
pip3 install lxml cryptography click pyramid pyramid_jinja2 pyramid_debugtoolbar wtforms alembic waitress SQLAlchemy transaction psycopg2_binary numpy astropy astroquery WTForms WTForms-Alchemy && \
pip3 install pyramid-retry pyramid-tm psycopg2 zope.sqlalchemy pyramid-wtforms repoze.sendmail pyramid-mailer && \
true
ADD . /app
WORKDIR /app
RUN pip3 install -e .
......
......@@ -86,7 +86,7 @@ class ImportProcess(threading.Thread):
print(i_entry)
si = StarInfo(i_session, headers, line_data)
si_msg = si.all_messages()
if si_msg.get('errors', None) is not None:
if si_msg and si_msg.get('errors', None) is not None:
errors_present = True
i_entry.error_data = json.dumps(si_msg)
if si_msg:
......@@ -203,7 +203,8 @@ def moderate_submission(request):
# doesn't work here... go figure
if ed:
error_data = json.loads(ed)
entry.update(error_data)
if error_data:
entry.update(error_data)
entry['unique'] = True
problem_fields = []
for v in entry.values():
......
File mode changed from 100644 to 100755