Merge pull request #2300 from unicef/staging

Staging

.isort.cfg

@@ -6,7 +6,8 @@ known_django = django
 sections = FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
 known_first_party = etools
 multi_line_output = 3
-line_length = 119
+line_length = 120
 balanced_wrapping = true
 order_by_type = false
 not_skip = __init__.py
+skip_glob = **/migrations/**

Dockerfile

@@ -48,7 +48,9 @@ RUN apk add postgresql-client
 RUN apk add openssl \
     ca-certificates \
     libressl2.7-libcrypto \
-    libmagic
+    libmagic \
+    libxslt
+
 RUN apk add geos \
     gdal --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/
 

Pipfile

@@ -15,30 +15,23 @@ pdbpp = "*"
 tox = "*"
 drf-api-checker = "*"
 factory-boy = ">=2.11"
-django-extensions = "*"
 sphinx = "*"
 
 [packages]
-amqp = "==2.4.2"
-asn1crypto = "==0.24.0"
-azure-common = "==1.1.8"
-azure-nspkg = "==2.0.0"
 azure-storage = "==0.20.2"
 carto = "==1.4"
-celery = "==4.2.1"
-cffi = "==1.11.5"
-coreapi = "==2.3.3"
-coreschema = "==0.0.4"
-cryptography = "==2.4.1"
-defusedxml = "==0.5.0"
-diff-match-patch = "==20121119"
+celery = "==4.3"
 dj-database-url = "==0.5"
 dj-static = "==0.0.6"
+Django = "==2.1.8"
 django-appconf = "==1.0.3"
+django_celery_beat = "==1.4"
 django-celery-email = "==2.0.1"
+django_celery_results = "==1.0.4"
 django-contrib-comments = "==1.9.1"
 django-cors-headers = "==2.5"
 django-debug-toolbar = "==1.11"
+django-extensions = "==2.1.6"
 django-easy-pdf = "==0.1.1"
 django-filter = "==2.1"
 django-fsm = "==2.6"
@@ -49,12 +42,13 @@ django-logentry-admin = "==1.0.4"
 django-model-utils = "==3.1.2"
 django-mptt = "==0.9.1"
 django-ordered-model = "==3.1.1"
+django-post_office = "==3.1.0"
 django-redis-cache = "==2.0"
 django-rest-swagger = "==2.2"
 django-storages = "==1.6.6"
 django-tenants = "==2.1"
 django-timezone-field = "==3.0"
-django-waffle = "==0.14"
+django-waffle = "==0.15.1"
 djangorestframework-csv = "==2.1.0"
 djangorestframework-gis = "==0.14"
 djangorestframework-jwt = "==1.11.0"
@@ -63,70 +57,27 @@ djangorestframework-xml = "==1.4"
 djangorestframework = "==3.9.2"
 drf-nested-routers = "==0.91"
 drf-querystringfilter = "==1.0.0"
-drfpasswordless = "==1.2"
 etools-validator = "==0.3.2"
-flower = "==0.9.2"
-future = "==0.15.2"
+flower = "==0.9.3"
+GDAL = "==2.4.0"
 gunicorn = "==19.9"
-html5lib = "==1.0.1"
-idna = "==2.6"
-itypes = "==1.1.0"
-jdcal = "==1.4"
-jsonfield = "==2.0.2"
-kombu = "==4.4"
 newrelic = "==2.94.0.79"
-oauthlib = "==2.0.7"
-odfpy = "==1.3.6"
-openapi-codec = "==1.3.2"
-openpyxl = "==2.5.9"
-psycopg2-binary = "==2.7.7"
-psycopg2 = "==2.7.5"
-pycparser = "==2.18"
-pyrestcli = "==0.6.4"
-python-crontab = "==2.3.5"
-python-dateutil = "==2.5.3"
-python3-openid = "==3.1.0"
-pytz = "==2018.3"
-raven = "==6.10"
+Pillow = "==5.4.1"
+psycopg2-binary = "==2.8.2"
+sentry-sdk = "==0.7.10"
 redis = "==3.2"
-reportlab = "==3.5.9"
-requests-oauthlib = "==0.8.0"
 requests = "==2.21"
-simplejson = "==3.16.0"
-six = "==1.11.0"
 social-auth-app-django = "==2.1.0"
 social-auth-core = {extras = ["azuread"],version = "==1.7.0"}
-sqlparse = "==0.2.4"
-static3 = "==0.7.0"
-tablib = "==0.12.1"
 tenant-schemas-celery = "==0.2.1"
-tornado = "==5.1.1"
+unicef_attachments = "==0.5.1"
 unicef-djangolib = "==0.5.2"
 unicef-locations = "==1.5"
-unicodecsv = "==0.14.1"
-uritemplate = "==3.0.0"
-vine = "==1.1.4"
-webencodings = "==0.5.1"
-xhtml2pdf = "==0.2.3"
-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.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.5.1"
 unicef_notification = "==0.2.1"
 unicef_restlib = "==0.4"
 unicef_snapshot = "==0.2.3"
-Pillow = "==5.4.1"
+unicef-rest-export = "==0.5.3"
+xhtml2pdf = "==0.2.3"
 
 [requires]
 python_version = "3.6.4"