Merge pull request #2245 from unicef/staging

Staging

Author: domdinicola

.circleci/config.yml

@@ -62,5 +62,5 @@ workflows:
                 - master
                 - staging
                 - develop
-                - prp-refactoring
+                - testing
                 - ci-updates

Dockerfile

@@ -15,7 +15,7 @@ RUN apk add \
     libxslt-dev \
     xmlsec-dev
 RUN apk add postgresql-dev \
-    libffi-dev\
+    libffi-dev \
     jpeg-dev
 
 RUN apk add --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ \
@@ -47,7 +47,8 @@ RUN apk add --upgrade apk-tools
 RUN apk add postgresql-client
 RUN apk add openssl \
     ca-certificates \
-    libressl2.7-libcrypto
+    libressl2.7-libcrypto \
+    libmagic
 RUN apk add geos \
     gdal --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/
 
@@ -57,6 +58,7 @@ ADD manage.py /code/manage.py
 WORKDIR /code/
 
 COPY --from=builder /usr/local/lib/python3.6/site-packages /usr/local/lib/python3.6/site-packages
+COPY --from=builder /usr/local/bin /usr/local/bin
 
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONPATH /code

Pipfile

@@ -14,17 +14,16 @@ ipython = "*"
 pdbpp = "*"
 tox = "*"
 drf-api-checker = "*"
-factory_boy = "==2.8"
+factory-boy = ">=2.11"
 django-extensions = "*"
 sphinx = "*"
 
 [packages]
-amqp = "==2.2.2"
+amqp = "==2.4.2"
 asn1crypto = "==0.24.0"
 azure-common = "==1.1.8"
 azure-nspkg = "==2.0.0"
 azure-storage = "==0.20.2"
-billiard = "==3.5.0.3"
 carto = "==1.4"
 celery = "==4.2.1"
 cffi = "==1.11.5"
@@ -35,22 +34,22 @@ defusedxml = "==0.5.0"
 diff-match-patch = "==20121119"
 dj-database-url = "==0.5"
 dj-static = "==0.0.6"
-django-appconf = "==1.0.2"
+django-appconf = "==1.0.3"
 django-celery-email = "==2.0.1"
-django-contrib-comments = "==1.9"
-django-cors-headers = "==2.4"
+django-contrib-comments = "==1.9.1"
+django-cors-headers = "==2.5"
 django-debug-toolbar = "==1.11"
 django-easy-pdf = "==0.1.1"
 django-filter = "==2.1"
 django-fsm = "==2.6"
 django-import-export = "==1.2"
-django-js-asset = "==1.1.0"
+django-js-asset = "==1.2.2"
 django-leaflet = "==0.24"
 django-logentry-admin = "==1.0.4"
 django-model-utils = "==3.1.2"
 django-mptt = "==0.9.1"
-django-ordered-model = "==1.5"
-django-redis-cache = "==1.8"
+django-ordered-model = "==3.1.1"
+django-redis-cache = "==2.0"
 django-rest-swagger = "==2.2"
 django-storages = "==1.6.6"
 django-tenants = "==2.1"
@@ -61,7 +60,7 @@ djangorestframework-gis = "==0.14"
 djangorestframework-jwt = "==1.11.0"
 djangorestframework-recursive = "==0.1.2"
 djangorestframework-xml = "==1.4"
-djangorestframework = "==3.9.1"
+djangorestframework = "==3.9.2"
 drf-nested-routers = "==0.91"
 drf-querystringfilter = "==1.0.0"
 drfpasswordless = "==1.2"
@@ -74,7 +73,7 @@ idna = "==2.6"
 itypes = "==1.1.0"
 jdcal = "==1.4"
 jsonfield = "==2.0.2"
-kombu = "==4.2.1"
+kombu = "==4.4"
 newrelic = "==2.94.0.79"
 oauthlib = "==2.0.7"
 odfpy = "==1.3.6"
@@ -89,7 +88,7 @@ python-dateutil = "==2.5.3"
 python3-openid = "==3.1.0"
 pytz = "==2018.3"
 raven = "==6.10"
-redis = "==2.10.6"
+redis = "==3.2"
 reportlab = "==3.5.9"
 requests-oauthlib = "==0.8.0"
 requests = "==2.21"
@@ -109,25 +108,25 @@ uritemplate = "==3.0.0"
 vine = "==1.1.4"
 webencodings = "==0.5.1"
 xhtml2pdf = "==0.2.3"
-xlrd = "==1.1.0"
+xlrd = "==1.2.0"
 xlwt = "==1.3.0"
 Babel = "==2.6.0"
 django_celery_beat = "==1.4"
 django_celery_results = "==1.0.4"
 django-post_office = "==3.1.0"
-Django = "==2.1.5"
+Django = "==2.1.7"
 et_xmlfile = "==1.0.1"
 GDAL = "==2.4.0"
 Jinja2 = "==2.10"
 MarkupSafe = "==1.1.0"
 PyJWT = "==1.5.3"
 PyPDF2 = "==1.26.0"
 PyYAML = "==3.12"
-unicef_attachments = "==0.4.2"
+unicef_attachments = "==0.5.1"
 unicef_notification = "==0.2.1"
 unicef_restlib = "==0.4"
-unicef_snapshot = "==0.2.2"
-Pillow = "==5.3.0"
+unicef_snapshot = "==0.2.3"
+Pillow = "==5.4.1"
 
 [requires]
 python_version = "3.6.4"