From bbeb66398dff442af9de118b8028bd115f95dd1a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 5 Feb 2020 13:00:05 +0000
Subject: [PATCH 1/3] pyup updates

Update cffi from 1.13.1 to 1.13.2
Update jsonschema from 3.1.1 to 3.2.0
Update marshmallow-sqlalchemy from 0.19.0 to 0.21.0
Update marshmallow from 2.20.2 to 3.4.0
Update sqlalchemy from 1.3.10 to 1.3.13
Update notifications-python-client from 5.4.1 to 5.5.1
---
 requirements-app.txt | 12 ++++++------
 requirements.txt     | 16 ++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/requirements-app.txt b/requirements-app.txt
index 73500d0de..71acd68b0 100644
--- a/requirements-app.txt
+++ b/requirements-app.txt
@@ -1,7 +1,7 @@
 # Run `make freeze-requirements` to update requirements.txt
 # with package version changes made in requirements-app.txt
 
-cffi==1.13.1
+cffi==1.13.2
 celery[sqs]==3.1.26.post2 # pyup: <4
 docopt==0.6.2
 Flask-Bcrypt==0.7.1
@@ -13,14 +13,14 @@ click-datetime==0.2
 eventlet==0.25.1
 gunicorn==20.0.4
 iso8601==0.1.12
-jsonschema==3.1.1
-marshmallow-sqlalchemy==0.19.0
-marshmallow==2.20.2  # pyup: <3 throws errors
+jsonschema==3.2.0
+marshmallow-sqlalchemy==0.21.0
+marshmallow==3.4.0  # pyup: <3 throws errors
 psycopg2-binary==2.8.4
 PyJWT==1.7.1
-SQLAlchemy==1.3.10
+SQLAlchemy==1.3.13
 
-notifications-python-client==5.4.1
+notifications-python-client==5.5.1
 
 # PaaS
 awscli-cwlogs>=1.4,<1.5
diff --git a/requirements.txt b/requirements.txt
index c94ebaa7f..0114c319f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@
 # Run `make freeze-requirements` to update requirements.txt
 # with package version changes made in requirements-app.txt
 
-cffi==1.13.1
+cffi==1.13.2
 celery[sqs]==3.1.26.post2 # pyup: <4
 docopt==0.6.2
 Flask-Bcrypt==0.7.1
@@ -15,14 +15,14 @@ click-datetime==0.2
 eventlet==0.25.1
 gunicorn==20.0.4
 iso8601==0.1.12
-jsonschema==3.1.1
-marshmallow-sqlalchemy==0.19.0
-marshmallow==2.20.2  # pyup: <3 throws errors
+jsonschema==3.2.0
+marshmallow-sqlalchemy==0.21.0
+marshmallow==3.4.0  # pyup: <3 throws errors
 psycopg2-binary==2.8.4
 PyJWT==1.7.1
-SQLAlchemy==1.3.10
+SQLAlchemy==1.3.13
 
-notifications-python-client==5.4.1
+notifications-python-client==5.5.1
 
 # PaaS
 awscli-cwlogs>=1.4,<1.5
@@ -38,13 +38,13 @@ alembic==1.4.0
 amqp==1.4.9
 anyjson==0.3.3
 attrs==19.3.0
-awscli==1.17.15
+awscli==1.17.16
 bcrypt==3.1.7
 billiard==3.3.0.23
 bleach==3.1.0
 boto==2.49.0
 boto3==1.10.38
-botocore==1.14.15
+botocore==1.14.16
 certifi==2019.11.28
 chardet==3.0.4
 Click==7.0

From 9e84fb2a007e622026339de75e9f4c412dac8952 Mon Sep 17 00:00:00 2001
From: Leo Hemsted <leo.hemsted@digital.cabinet-office.gov.uk>
Date: Tue, 11 Feb 2020 14:24:13 +0000
Subject: [PATCH 2/3] pin marshmallow to <v3

also, fix pyup comment syntax. descriptions in pyup comments need to
have an additional # prefix
---
 requirements-app.txt | 6 ++----
 requirements.txt     | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/requirements-app.txt b/requirements-app.txt
index 71acd68b0..7e275f21a 100644
--- a/requirements-app.txt
+++ b/requirements-app.txt
@@ -13,9 +13,10 @@ click-datetime==0.2
 eventlet==0.25.1
 gunicorn==20.0.4
 iso8601==0.1.12
+itsdangerous==1.1.0
 jsonschema==3.2.0
 marshmallow-sqlalchemy==0.21.0
-marshmallow==3.4.0  # pyup: <3 throws errors
+marshmallow==2.20.2 # pyup: <3 # v3 throws errors
 psycopg2-binary==2.8.4
 PyJWT==1.7.1
 SQLAlchemy==1.3.13
@@ -26,7 +27,4 @@ notifications-python-client==5.5.1
 awscli-cwlogs>=1.4,<1.5
 
 
-# Putting upgrade on hold due to v1.0.0 using sha512 instead of sha1 by default
-itsdangerous==0.24  # pyup: <1.0.0
-
 git+https://github.com/alphagov/notifications-utils.git@36.5.0#egg=notifications-utils==36.5.0
diff --git a/requirements.txt b/requirements.txt
index 0114c319f..bacdf1dfd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,9 +15,10 @@ click-datetime==0.2
 eventlet==0.25.1
 gunicorn==20.0.4
 iso8601==0.1.12
+itsdangerous==1.1.0
 jsonschema==3.2.0
 marshmallow-sqlalchemy==0.21.0
-marshmallow==3.4.0  # pyup: <3 throws errors
+marshmallow==2.20.2 # pyup: <3 # v3 throws errors
 psycopg2-binary==2.8.4
 PyJWT==1.7.1
 SQLAlchemy==1.3.13
@@ -28,9 +29,6 @@ notifications-python-client==5.5.1
 awscli-cwlogs>=1.4,<1.5
 
 
-# Putting upgrade on hold due to v1.0.0 using sha512 instead of sha1 by default
-itsdangerous==0.24  # pyup: <1.0.0
-
 git+https://github.com/alphagov/notifications-utils.git@36.5.0#egg=notifications-utils==36.5.0
 
 ## The following requirements were added by pip freeze:

From a97948574ad6719a2c8ca81b8393b5acb6202327 Mon Sep 17 00:00:00 2001
From: Leo Hemsted <leo.hemsted@digital.cabinet-office.gov.uk>
Date: Tue, 11 Feb 2020 16:27:44 +0000
Subject: [PATCH 3/3] remove unused pytest flags

---
 scripts/run_tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
index 2e3e25013..753cf8881 100755
--- a/scripts/run_tests.sh
+++ b/scripts/run_tests.sh
@@ -31,5 +31,5 @@ flake8 .
 display_result $? 1 "Code style check"
 
 # run with four concurrent threads
-py.test --disable-pytest-warnings --cov=app --cov-report=term-missing tests/ --junitxml=test_results.xml -n4 -v --maxfail=10
+py.test -n4 -v --maxfail=10
 display_result $? 2 "Unit tests"