Merge remote-tracking branch 'origin/master' into 2113-archive-flow-fix

dependencies/pip/dev_requirements.txt

@@ -2,107 +2,113 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file dependencies/pip/dev_requirements.txt dependencies/pip/dev_requirements.in
+#    pip-compile --output-file dev_requirements.txt dev_requirements.in
 #
 -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest
 -e git+https://github.com/kobotoolbox/formpack.git@6f39abc642920964b6fbcfae16deb4b935956ad3#egg=formpack
-amqp==2.1.4
+amqp==2.4.0
 anyjson==0.3.3
 argparse==1.4.0           # via unittest2
 asn1crypto==0.24.0        # via cryptography
+bcrypt==3.1.6             # via paramiko
 begins==0.9
-billiard==3.5.0.2
-boto3==1.5.8
-boto==2.45.0
-botocore==1.8.22          # via boto3, s3transfer
-celery==4.0.2
-cffi==1.9.1               # via cryptography
+billiard==3.5.0.5
+boto3==1.9.80
+boto==2.49.0
+botocore==1.12.80         # via boto3, s3transfer
+celery==4.2.1
+certifi==2018.11.29       # via requests
+cffi==1.8.3               # via bcrypt, cryptography, pynacl
+chardet==3.0.4            # via requests
 cookies==2.2.1            # via responses
-cryptography==2.2.2       # via paramiko, pyopenssl
+cryptography==2.2.2       # via fabric, paramiko, pyopenssl
 cssselect==1.0.3          # via pyquery
 cyordereddict==1.0.0
 defusedxml==0.5.0         # via djangorestframework-xml
-dj-database-url==0.4.2
+dj-database-url==0.4.1
 dj-static==0.0.6
-django-braces==1.11.0
+django-braces==1.13.0
 django-celery-beat==1.1.1
 django-constance[database]==2.2.0
-django-debug-toolbar==1.6
-django-extensions==1.7.6
-django-guardian==1.4.1
+django-debug-toolbar==1.4
+django-extensions==1.6.7
 django-haystack==2.6.0
 django-jsonbfield==0.1.0
 django-loginas==0.2.3
 django-markitup==3.0.0
 django-mptt==0.8.7
-django-oauth-toolkit==0.11.0
+django-oauth-toolkit==0.10.0
 django-picklefield==1.0.0  # via django-constance
 django-private-storage==2.1.2
 django-registration-redux==1.3
 django-reversion==2.0.8
-django-ses==0.8.1
+django-ses==0.8.9
 django-storages==1.6.5
 django-taggit==0.22.0
 django-toolbelt==0.0.1
-django-webpack-loader==0.4.1
-django==1.8.17
-djangorestframework-xml==1.3.0
-djangorestframework==3.5.4
-docutils==0.13.1          # via botocore, statistics
+django-webpack-loader==0.3.0
+django==1.8.19
+djangorestframework-xml==1.4.0
+djangorestframework==3.6.4
+docutils==0.14            # via botocore, statistics
 drf-extensions==0.3.1
 enum34==1.1.6             # via cryptography
-fabric==1.13.1
+fabric==2.4.0
 formencode==1.3.1         # via pyxform
 funcsigs==1.0.2           # via begins, mock
 functools32==3.2.3.post2  # via jsonschema
-futures==3.1.1            # via s3transfer
-gunicorn==19.6.0
-idna==2.2                 # via cryptography
-ipaddress==1.0.18         # via cryptography
+future==0.17.1            # via django-ses
+futures==3.2.0            # via s3transfer
+gunicorn==19.4.5
+idna==2.8                 # via cryptography, requests
+invoke==1.2.0             # via fabric
+ipaddress==1.0.17         # via cryptography
 jmespath==0.9.3           # via boto3, botocore
 jsonfield==1.0.3
 jsonschema==2.6.0
-kombu==4.0.2
+kombu==4.2.2.post1
 linecache2==1.0.0         # via traceback2
 lxml==4.2.1
-markdown==2.6.8
+markdown==3.0.1
 mock==2.0.0
 ndg-httpsclient==0.4.2
-oauthlib==1.1.2
-paramiko==2.1.1           # via fabric
+oauthlib==1.0.3
+paramiko==2.4.2           # via fabric
 path.py==11.0.1
 pbr==4.0.2                # via mock
-psycopg2==2.7.3.2
-py==1.4.32                # via pytest
-pyasn1==0.2.2
-pycparser==2.17           # via cffi
-pygments==2.2.0
-pymongo==3.4.0
+psycopg2-binary==2.7.6.1
+py==1.4.31                # via pytest
+pyasn1==0.1.9
+pycparser==2.14           # via cffi
+pygments==2.1.3
+pymongo==3.7.2
+pynacl==1.3.0             # via paramiko
 pyopenssl==18.0.0
 pyquery==1.4.0
 pytest-django==3.1.2
-pytest==3.0.6             # via pytest-django
-python-dateutil==2.6.0
+pytest==3.0.3             # via pytest-django
+python-dateutil==2.7.5
 python-digest==1.7
-pytz==2016.10
+pytz==2018.9
 pyxform==0.12.0
-requests==2.13.0
+requests==2.21.0
 responses==0.9.0
-s3transfer==0.1.11        # via boto3
+s3transfer==0.1.13        # via boto3
 shortuuid==0.4.3
-six==1.10.0
-sqlparse==0.2.2
+six==1.12.0
+sqlparse==0.1.19
 static3==0.7.0
 statistics==1.0.3.5
-tabulate==0.7.7
+tabulate==0.8.2
 traceback2==1.4.0         # via unittest2
 unicodecsv==0.14.1
 unittest2==1.1.0          # via pyxform
+urllib3==1.24.1           # via botocore, requests
 uwsgi==2.0.17
-vine==1.1.3               # via amqp
-werkzeug==0.11.15
+vine==1.2.0               # via amqp
+werkzeug==0.14.1
 whitenoise==3.3.1
 whoosh==2.7.4
 xlrd==1.1.0
-xlsxwriter==1.0.4
-xlwt==1.2.0
+xlsxwriter==1.1.2
+xlwt==1.3.0

dependencies/pip/external_services.txt

@@ -2,35 +2,36 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file dependencies/pip/external_services.txt dependencies/pip/external_services.in
+#    pip-compile --output-file external_services.txt external_services.in
 #
 -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest
 -e git+https://github.com/kobotoolbox/formpack.git@6f39abc642920964b6fbcfae16deb4b935956ad3#egg=formpack
-amqp==2.3.2
+amqp==2.4.0
 anyjson==0.3.3
 argparse==1.4.0           # via unittest2
 asn1crypto==0.24.0        # via cryptography
 begins==0.9
-billiard==3.5.0.4
-boto3==1.5.8
-boto==2.40.0
-botocore==1.8.22          # via boto3, s3transfer
+billiard==3.5.0.5
+boto3==1.9.80
+boto==2.49.0
+botocore==1.12.80         # via boto3, s3transfer
 celery==4.2.1
+certifi==2018.11.29       # via requests
 cffi==1.8.3               # via cryptography
-contextlib2==0.5.4        # via raven
+chardet==3.0.4            # via requests
+contextlib2==0.5.5        # via raven
 cookies==2.2.1            # via responses
 cryptography==2.2.2       # via pyopenssl
 cssselect==1.0.3          # via pyquery
 cyordereddict==1.0.0
 defusedxml==0.5.0         # via djangorestframework-xml
 dj-database-url==0.4.1
 dj-static==0.0.6
-django-braces==1.8.1
+django-braces==1.13.0
 django-celery-beat==1.1.1
 django-constance[database]==2.2.0
 django-debug-toolbar==1.4
 django-extensions==1.6.7
-django-guardian==1.4.1
 django-haystack==2.6.0
 django-jsonbfield==0.1.0
 django-loginas==0.2.3
@@ -41,70 +42,71 @@ django-picklefield==1.0.0  # via django-constance
 django-private-storage==2.1.2
 django-registration-redux==1.3
 django-reversion==2.0.8
-django-ses==0.7.1
+django-ses==0.8.9
 django-storages==1.6.5
 django-taggit==0.22.0
 django-toolbelt==0.0.1
 django-webpack-loader==0.3.0
-django==1.8.13
-djangorestframework-xml==1.3.0
-djangorestframework==3.3.3
-docutils==0.12            # via botocore, statistics
+django==1.8.19
+djangorestframework-xml==1.4.0
+djangorestframework==3.6.4
+docutils==0.14            # via botocore, statistics
 drf-extensions==0.3.1
 enum34==1.1.6             # via cryptography
 formencode==1.3.1         # via pyxform
 funcsigs==1.0.2           # via begins, mock
 functools32==3.2.3.post2  # via jsonschema
-futures==3.1.1            # via s3transfer
+future==0.17.1            # via django-ses
+futures==3.2.0            # via s3transfer
 gunicorn==19.4.5
-idna==2.1                 # via cryptography
+idna==2.8                 # via cryptography, requests
 ipaddress==1.0.17         # via cryptography
 jmespath==0.9.3           # via boto3, botocore
 jsonfield==1.0.3
 jsonschema==2.6.0
-kombu==4.2.1
+kombu==4.2.2.post1
 linecache2==1.0.0         # via traceback2
 lxml==4.2.1
-markdown==2.6.6
+markdown==3.0.1
 mock==2.0.0
 ndg-httpsclient==0.4.2
 newrelic==2.84.0.64
 oauthlib==1.0.3
 path.py==11.0.1
 pbr==4.0.2                # via mock
-psycopg2==2.7.3.2
+psycopg2-binary==2.7.6.1
 py==1.4.31                # via pytest
 pyasn1==0.1.9
 pycparser==2.14           # via cffi
 pygments==2.1.3
-pymongo==3.3.0
+pymongo==3.7.2
 pyopenssl==18.0.0
 pyquery==1.4.0
 pytest-django==3.1.2
 pytest==3.0.3             # via pytest-django
-python-dateutil==2.6.0
+python-dateutil==2.7.5
 python-digest==1.7
-pytz==2016.4
-pyxform==0.11.5
+pytz==2018.9
+pyxform==0.12.0
 raven==5.32.0
-requests==2.10.0
+requests==2.21.0
 responses==0.9.0
-s3transfer==0.1.11        # via boto3
+s3transfer==0.1.13        # via boto3
 shortuuid==0.4.3
-six==1.10.0
+six==1.12.0
 sqlparse==0.1.19
 static3==0.7.0
 statistics==1.0.3.5
-tabulate==0.7.5
+tabulate==0.8.2
 traceback2==1.4.0         # via unittest2
 transifex-client==0.11
 unicodecsv==0.14.1
 unittest2==1.1.0          # via pyxform
-urllib3==1.15.1           # via transifex-client
+urllib3==1.24.1           # via botocore, requests, transifex-client
 uwsgi==2.0.17
-vine==1.1.4               # via amqp
+vine==1.2.0               # via amqp
 whitenoise==3.3.1
 whoosh==2.7.4
 xlrd==1.1.0
-xlsxwriter==1.0.4
-xlwt==1.0.0
+xlsxwriter==1.1.2
+xlwt==1.3.0

dependencies/pip/requirements.in

@@ -9,9 +9,6 @@
 python-digest==1.7
 -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest
 
-# django-guardian must match KoBoCAT's version
-django-guardian==1.4.1
-
 # Regular PyPI packages
 Django<1.9
 Markdown
@@ -52,7 +49,7 @@ kombu
 lxml
 mock
 oauthlib
-psycopg2
+psycopg2-binary
 pymongo
 pytest-django
 python-dateutil