Merge pull request #3072 from unicef/staging

Staging

.circleci/config.yml

@@ -65,7 +65,7 @@ jobs:
           name: Run Tests
           command: |
             pip install --upgrade tox
-            tox -e d22,report
+            tox -e d32,report
       - save_cache:
           key: deps2-{{ .Branch }}--{{ checksum "Pipfile.lock" }}-{{ checksum ".circleci/config.yml" }}
           paths:

Dockerfile-base

@@ -1,10 +1,13 @@
-FROM python:3.7-alpine3.11
+FROM python:3.9.6-alpine3.14
 
 RUN apk update
+
+RUN apk add \
+    --update alpine-sdk
+
 RUN apk add --upgrade apk-tools \
     openssl \
     ca-certificates \
-    libressl3.0-libcrypto \
     libmagic \
     libxslt \
     geos \
@@ -21,14 +24,11 @@ RUN apk add --no-cache --virtual .build-deps --update \
     postgresql-dev \
     libffi-dev \
     jpeg-dev \
-    python-dev \
     geos-dev \
     gdal-dev \
     gcc \
     g++
 
-
-# PYTHON
 RUN pip install --no-cache-dir --upgrade \
     setuptools \
     pip \

Pipfile

@@ -22,66 +22,68 @@ azure-common = "==1.1.27"
 azure-storage-blob = "==2.1.0"
 azure-storage-common = "==2.1.0"
 carto = "==1.11.2"
-celery = "==5.0.5"
+celery = "==5.1.2"
 cryptography = "<3.4"
 dj-database-url = "==0.5"
 dj-static = "==0.0.6"
-Django = "<3.0"
+Django = "==3.2.6"
+django-admin-extra-urls = "*"
 django-appconf = "==1.0.4"
-django_celery_beat = "==2.1"
+django-celery-beat = "==2.2.1"
 django-celery-email = "==3.0.0"
-django_celery_results = "==2.0.0"
+django-celery-results = "==2.2"
 django-contrib-comments = "==2.1.0"
-django-cors-headers = "==3.6.0"
-django-debug-toolbar = "==3.2"
-django-extensions = "==3.1.2"
-django-easy-pdf = "==0.1.1"  # not maintained dj<3.0
+django-cors-headers = "==3.7.0"
+django-debug-toolbar = "==3.2.1"
+django-extensions = "==3.1.3"
+django-easy-pdf3 = "==0.1.2"
 django-filter = "==2.4.0"
 django-fsm = "==2.7.1"
 django-import-export = "==2.5.0"
 django-js-asset = "==1.2.2"
-django-leaflet = "==0.27.1"
+django-leaflet = "==0.28.1"
 django-logentry-admin = "==1.0.6"
 django-model-utils = "==4.1.1"
-django-ordered-model = "==3.4.1"
-django-post_office = "==3.5.3"
+django-ordered-model = "==3.4.3"
+django-post-office = "==3.5.3"
 django-redis-cache = "==3.0"
 django-rest-swagger = "==2.2"
 django-storages = {extras = ["azure"],version = "==1.11.1"}
-django-tenants = "==3.2.1"
-django-timezone-field = "==4.1.2"
-django-waffle = "==2.0.0"
-djangorestframework-csv = "==2.1.0"
-djangorestframework-gis = "==0.16"
-djangorestframework-jwt = "==1.11.0"
+django-tenants = "==3.3.2"
+django-timezone-field = "==4.2.1"
+django-waffle = "==2.1.0"
+djangorestframework-csv = "==2.1.1"
+djangorestframework-gis = "==0.17"
+djangorestframework-simplejwt = "==4.8"
 djangorestframework-recursive = "==0.1.2"
 djangorestframework-xml = "==2.0.0"
 djangorestframework = "==3.12.4"
 drf-nested-routers = "==0.93.3"
 drf-querystringfilter = "==1.0.0"
-etools-validator = "==0.3.4"
+etools-validator = "==0.5.0"
 flower = "==0.9.5"  # issue when locking
 GDAL = "==3.0.2"
 gunicorn = "<20.0"
 newrelic = "*"
 Pillow = "==8.1.0"
-psycopg2-binary = "==2.8.6"
+psycopg2-binary = "==2.9.1"
 sentry-sdk = "*"
-requests = "==2.25.1"
+requests = "==2.26"
 social-auth-app-django = "==4.0"
-social-auth-core = {extras = ["azuread"],version = "==3.3.3"}
+social-auth-core = {extras = ["azuread"],version = "==4.1"}
 tenant-schemas-celery = "==1.0.1"
-unicef_attachments = "==0.9.0"
+unicef-attachments = "==0.9.0"
 unicef-djangolib = "==0.5.4"
-unicef-locations = "==1.9"
-unicef_notification = "==0.2.1"
-unicef_restlib = "==0.7"
-unicef_snapshot = "==0.2.3"
+unicef-locations = "==3.0"
+unicef-notification = "==0.2.1"
+unicef-restlib = "==0.7"
+unicef-snapshot = "==1.1"
 unicef-rest-export = "==0.5.3"
 xhtml2pdf = "==0.2.5"
 unicef-vision = "==0.6"
 etools-offline = "==0.1.0"
 openpyxl = "==3.0.5"
+pyyaml = "==5.4.1"
 
 [requires]
-python_version = "3.7"
+python_version = "3.9"