Merge pull request #2466 from unicef/staging

Staging

.gitignore

@@ -23,15 +23,11 @@ build
 
 *idea*
 
-EquiTrack/static/*
-EquiTrack/migration_errors.txt
 static/*
 media
 
 *.dump
 dump.rdb
-.vagrant
-vagrant_ansible_inventory_default
 
 *.cpg
 *.dbf
@@ -42,7 +38,6 @@ packer_cache
 *.iso
 *.box
 
-Vagrantfile
 saml/FederationMetadata.xml
 
 *.tar

MANIFEST.in

@@ -7,8 +7,6 @@ include *.py
 recursive-include docs *
 recursive-include src/etools *
 
-recursive-include src/requirements *.txt
-
 exclude src/etools/settings/custom.*.py
 exclude .coverage
 exclude .coveragerc
@@ -34,9 +32,7 @@ exclude docker-compose_v2.yml
 exclude docs
 exclude runtests.sh
 exclude screenshots
-exclude src/requirements/input
 exclude wait-for-it.sh
-exclude requirements.txt
 
 exclude refactor.sh
 exclude setup.in

Pipfile

@@ -23,24 +23,24 @@ carto = "==1.6"
 celery = "==4.3"
 dj-database-url = "==0.5"
 dj-static = "==0.0.6"
-Django = "==2.2.3"
+Django = "==2.2.4"
 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.0.2"
-django-debug-toolbar = "==1.11"
-django-extensions = "==2.0"
+django-debug-toolbar = "==2.0"
+django-extensions = "==2.2.1"
 django-easy-pdf = "==0.1.1"
-django-filter = "==2.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-logentry-admin = "==1.0.4"
-django-model-utils = "==3.1.2"
-django-ordered-model = "==3.1.1"
+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.0"
 django-rest-swagger = "==2.2"
@@ -53,7 +53,7 @@ djangorestframework-gis = "==0.14"
 djangorestframework-jwt = "==1.11.0"
 djangorestframework-recursive = "==0.1.2"
 djangorestframework-xml = "==1.4"
-djangorestframework = "==3.9.4"
+djangorestframework = "==3.10.1"
 drf-nested-routers = "==0.91"
 drf-querystringfilter = "==1.0.0"
 etools-validator = "==0.3.2"
@@ -63,12 +63,12 @@ gunicorn = "==19.9"
 newrelic = "==4.20.1.121"
 Pillow = "==5.4.1"
 psycopg2-binary = "==2.8.3"
-sentry-sdk = "==0.9.5"
+sentry-sdk = "==0.10.2"
 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.1"
+unicef_attachments = "==0.5.2"
 unicef-djangolib = "==0.5.3"
 unicef-locations = "==1.7"
 unicef_notification = "==0.2.1"
@@ -77,6 +77,7 @@ unicef_snapshot = "==0.2.3"
 unicef-rest-export = "==0.5.3"
 xhtml2pdf = "==0.2.3"
 unicef-vision = "*"
+docutils = "==0.15"
 
 [requires]
 python_version = "3.7"