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] 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: