Merge pull request #2434 from unicef/staging

Staging

.circleci/config.yml

@@ -4,7 +4,7 @@ jobs:
     working_directory: ~/code
     # The primary container is an instance of the first list image listed. Your build commands run in this container.
     docker:
-      - image: unicef/etools:test-base-p3-v2
+      - image: unicef/etools:test-base-p37
         environment:
           PGHOST: 127.0.0.1
           DATABASE_URL: "postgis://postgres:postgres@localhost:5432/circle_test"
@@ -22,6 +22,7 @@ jobs:
       - run:
           name: Run Tests
           command: |
+            pip install tox
             tox -e d22,report
       - save_cache:
           key: deps2-{{ .Branch }}--{{ checksum "Pipfile.lock" }}-{{ checksum ".circleci/config.yml" }}

.circleci/images/primary/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6.4-alpine
+FROM python:3.7.3-alpine
 # test-base-p3-v2
 RUN echo "http://dl-3.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories
 RUN apk update

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6.4-alpine as builder
+FROM python:3.7.3-alpine as builder
 
 RUN echo "http://dl-3.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories
 RUN apk update
@@ -39,7 +39,7 @@ ADD Pipfile.lock .
 RUN pipenv install --system  --ignore-pipfile --deploy
 
 
-FROM python:3.6.4-alpine
+FROM python:3.7.3-alpine
 
 RUN echo "http://dl-3.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories
 RUN apk update
@@ -59,7 +59,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/lib/python3.7/site-packages /usr/local/lib/python3.7/site-packages
 COPY --from=builder /usr/local/bin /usr/local/bin
 
 ENV PYTHONUNBUFFERED 1

Dockerfile-dev

@@ -1,4 +1,4 @@
-FROM python:3.6.4-alpine
+FROM python:3.7.3-alpine
 
 RUN echo "http://dl-3.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories
 RUN apk update

Pipfile

@@ -19,20 +19,19 @@ sphinx = "*"
 vcrpy = "*"
 
 [packages]
-azure-storage = "==0.20.2"
-carto = "==1.4"
+carto = "==1.6"
 celery = "==4.3"
 dj-database-url = "==0.5"
 dj-static = "==0.0.6"
-Django = "==2.2.1"
+Django = "==2.2.3"
 django-appconf = "==1.0.3"
-django_celery_beat = "==1.4"
-django-celery-email = "==2.0.1"
-django_celery_results = "==1.0.4"
+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 = "==2.5.3"
+django-cors-headers = "==3.0.2"
 django-debug-toolbar = "==1.11"
-django-extensions = "==2.1.6"
+django-extensions = "==2.0"
 django-easy-pdf = "==0.1.1"
 django-filter = "==2.1"
 django-fsm = "==2.6.1"
@@ -42,33 +41,32 @@ django-leaflet = "==0.24"
 django-logentry-admin = "==1.0.4"
 django-model-utils = "==3.1.2"
 django-ordered-model = "==3.1.1"
-django-post_office = "==3.1.0"
+django-post_office = "==3.2.1"
 django-redis-cache = "==2.0"
 django-rest-swagger = "==2.2"
-django-storages = "==1.6.6"
+django-storages = {extras = ["azure"],version = "==1.7.1"}
 django-tenants = "==2.2.2"
 django-timezone-field = "==3.0"
-django-waffle = "==0.16"
+django-waffle = "==0.17"
 djangorestframework-csv = "==2.1.0"
 djangorestframework-gis = "==0.14"
 djangorestframework-jwt = "==1.11.0"
 djangorestframework-recursive = "==0.1.2"
 djangorestframework-xml = "==1.4"
-djangorestframework = "==3.9.3"
+djangorestframework = "==3.9.4"
 drf-nested-routers = "==0.91"
 drf-querystringfilter = "==1.0.0"
 etools-validator = "==0.3.2"
 flower = "==0.9.3"
 GDAL = "==2.4.0"
 gunicorn = "==19.9"
-newrelic = "==2.94.0.79"
+newrelic = "==4.20.1.121"
 Pillow = "==5.4.1"
-psycopg2-binary = "==2.8.2"
-sentry-sdk = "==0.7.14"
-redis = "==3.2.1"
-requests = "==2.21"
+psycopg2-binary = "==2.8.3"
+sentry-sdk = "==0.9.5"
+requests = "==2.22"
 social-auth-app-django = "==3.1"
-social-auth-core = {extras = ["azuread"],version = "==3.1"}
+social-auth-core = {extras = ["azuread"],version = "==3.2"}
 tenant-schemas-celery = "==0.2.1"
 unicef_attachments = "==0.5.1"
 unicef-djangolib = "==0.5.3"
@@ -81,4 +79,4 @@ xhtml2pdf = "==0.2.3"
 unicef-vision = "*"
 
 [requires]
-python_version = "3.6.4"
+python_version = "3.7"