Merge branch 'feature/djelme-dep-fix' into feature/python-upgrade

Dockerfile

@@ -162,19 +162,19 @@ ENV GIT_COMMIT ${GIT_COMMIT}
 
 # TODO: Uncomment following RUN when python dependencies are ready
 
- RUN for module in \
-        api.base.settings \
-        admin.base.settings \
-    ; do \
-        export DJANGO_SETTINGS_MODULE=$module \
-        && python3 manage.py collectstatic --noinput --no-init-app \
-    ; done \
-    && for file in \
-        ./website/templates/_log_templates.mako \
-        ./website/static/built/nodeCategories.json \
-    ; do \
-        touch $file && chmod o+w $file \
-    ; done \
-    && rm ./website/settings/local.py ./api/base/settings/local.py
+RUN for module in \
+       api.base.settings \
+       admin.base.settings \
+   ; do \
+       export DJANGO_SETTINGS_MODULE=$module \
+       && python3 manage.py collectstatic --noinput --no-init-app \
+   ; done \
+   && for file in \
+       ./website/templates/_log_templates.mako \
+       ./website/static/built/nodeCategories.json \
+   ; do \
+       touch $file && chmod o+w $file \
+   ; done \
+   && rm ./website/settings/local.py ./api/base/settings/local.py
 
 CMD ["su-exec", "nobody", "invoke", "--list"]

requirements.txt

@@ -98,6 +98,7 @@ rdflib-jsonld==0.6.2
 
 # Metrics
 # git+https://github.com/CenterForOpenScience/[email protected]
+git+https://github.com/felliott/django-elasticsearch-metrics@feature/pin-esdsl
 
 # Impact Metrics CSV Export
 djangorestframework-csv==2.1.0