Merge pull request #2599 from unicef/staging

Staging to Master

.dockerignore

@@ -1 +1,13 @@
-.git
+.git
+.benchmarks
+.circleci
+.pytest_cache
+.tox
+.venv
+.virtualenv_hooks
+db
+db_dumps
+dist
+docs
+screenshots
+src/etools/**/tests/**/*.py

Dockerfile

@@ -18,12 +18,14 @@ RUN apk add postgresql-dev \
     libffi-dev \
     jpeg-dev
 
-RUN apk add --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ \
-    gdal \
-    gdal-dev \
-    py-gdal \
+RUN apk add --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/community/ \
     geos \
     geos-dev \
+    gdal \
+    gdal-dev \
+    py-gdal
+
+RUN apk add --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ \
     gcc \
     g++
 
@@ -51,8 +53,9 @@ RUN apk add openssl \
     libmagic \
     libxslt
 
-RUN apk add geos \
-    gdal --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/
+RUN apk add --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/community/ \
+    geos \
+    gdal
 
 ADD src /code/
 ADD manage.py /code/manage.py

Dockerfile-dev

@@ -18,12 +18,14 @@ RUN apk add postgresql-dev \
     libffi-dev\
     jpeg-dev
 
-RUN apk add --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ \
-    gdal \
-    gdal-dev \
-    py-gdal \
+RUN apk add --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/community/ \
     geos \
     geos-dev \
+    gdal \
+    gdal-dev \
+    py-gdal
+
+RUN apk add --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ \
     gcc \
     g++
 

Pipfile

@@ -19,35 +19,38 @@ sphinx = "*"
 vcrpy = "*"
 
 [packages]
-carto = "==1.7"
+azure-common = "==1.1.23"
+azure-storage-blob = "==2.1.0"
+azure-storage-common = "==2.1.0"
+carto = "==1.8.1"
 celery = "==4.3"
 dj-database-url = "==0.5"
 dj-static = "==0.0.6"
-Django = "==2.2.6"
+Django = "==2.2.7"
 django-appconf = "==1.0.3"
 django_celery_beat = "==1.5"
 django-celery-email = "==2.0.2"
 django_celery_results = "==1.1.2"
 django-contrib-comments = "==1.9.1"
 django-cors-headers = "==3.1.1"
-django-debug-toolbar = "==2.0"
-django-extensions = "==2.2.3"
+django-debug-toolbar = "==2.1"
+django-extensions = "==2.2.5"
 django-easy-pdf = "==0.1.1"
 django-filter = "==2.2"
 django-fsm = "==2.6.1"
 django-import-export = "==1.2"
 django-js-asset = "==1.2.2"
-django-leaflet = "==0.24"
+django-leaflet = "==0.25"
 django-logentry-admin = "==1.0.5"
 django-model-utils = "==3.2"
 django-ordered-model = "==3.3"
 django-post_office = "==3.2.1"
 django-redis-cache = "==2.1"
 django-rest-swagger = "==2.2"
 django-storages = {extras = ["azure"],version = "==1.7.2"}
-django-tenants = "==2.2.2"
+django-tenants = "==2.2.3"
 django-timezone-field = "==3.1"
-django-waffle = "==0.17"
+django-waffle = "==0.18"
 djangorestframework-csv = "==2.1.0"
 djangorestframework-gis = "==0.14"
 djangorestframework-jwt = "==1.11.0"
@@ -56,28 +59,27 @@ djangorestframework-xml = "==1.4"
 djangorestframework = "==3.10.3"
 drf-nested-routers = "==0.91"
 drf-querystringfilter = "==1.0.0"
-etools-validator = "==0.3.3"
+etools-validator = "==0.3.4"
 flower = "==0.9.3"
 GDAL = "==2.4.0"
-gunicorn = "==19.9"
-newrelic = "==5.2.0.127"
-Pillow = "==5.4.1"
-psycopg2-binary = "==2.8.3"
-sentry-sdk = "==0.12.3"
+gunicorn = "<20.0"
+newrelic = "*"
+Pillow = "==6.2.1"
+psycopg2-binary = "==2.8.4"
+sentry-sdk = "*"
 requests = "==2.22"
 social-auth-app-django = "==3.1"
 social-auth-core = {extras = ["azuread"],version = "==3.2"}
 tenant-schemas-celery = "==0.2.1"
-unicef_attachments = "==0.5.2"
+unicef_attachments = "==0.7.0"
 unicef-djangolib = "==0.5.3"
 unicef-locations = "==1.8"
 unicef_notification = "==0.2.1"
-unicef_restlib = "==0.4"
+unicef_restlib = "==0.5"
 unicef_snapshot = "==0.2.3"
 unicef-rest-export = "==0.5.3"
 xhtml2pdf = "==0.2.3"
 unicef-vision = "*"
-kombu = "==4.6.6"
 
 [requires]
 python_version = "3.7"