From ee69e70b762a9d675e350ada2f6d31a29c8c09e3 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Wed, 24 Apr 2019 12:25:14 +0100 Subject: [PATCH] Bump requirements. Minor weekly updated and a bump for a security alert in urllib3. Sort list in test, to ensure it passes everytime. --- requirements-app.txt | 6 +++--- requirements.txt | 8 ++++---- tests/app/template_folder/test_template_folder_rest.py | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/requirements-app.txt b/requirements-app.txt index b05df342d..43d311360 100644 --- a/requirements-app.txt +++ b/requirements-app.txt @@ -14,11 +14,11 @@ eventlet==0.24.1 gunicorn==19.7.1 # pyup: ignore, >19.8 breaks eventlet patching iso8601==0.1.12 jsonschema==3.0.1 -marshmallow-sqlalchemy==0.16.1 +marshmallow-sqlalchemy==0.16.2 marshmallow==2.19.2 -psycopg2-binary==2.8.1 +psycopg2-binary==2.8.2 PyJWT==1.7.1 -SQLAlchemy==1.3.2 +SQLAlchemy==1.3.3 notifications-python-client==5.3.0 diff --git a/requirements.txt b/requirements.txt index aa66c1826..f2262b0fe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,11 +16,11 @@ eventlet==0.24.1 gunicorn==19.7.1 # pyup: ignore, >19.8 breaks eventlet patching iso8601==0.1.12 jsonschema==3.0.1 -marshmallow-sqlalchemy==0.16.1 +marshmallow-sqlalchemy==0.16.2 marshmallow==2.19.2 -psycopg2-binary==2.8.1 +psycopg2-binary==2.8.2 PyJWT==1.7.1 -SQLAlchemy==1.3.2 +SQLAlchemy==1.3.3 notifications-python-client==5.3.0 @@ -31,7 +31,7 @@ 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@31.2.5#egg=notifications-utils==31.2.5 +git+https://github.com/alphagov/notifications-utils.git@31.2.2#egg=notifications-utils==31.2.2 git+https://github.com/alphagov/boto.git@2.43.0-patch3#egg=boto==2.43.0-patch3 diff --git a/tests/app/template_folder/test_template_folder_rest.py b/tests/app/template_folder/test_template_folder_rest.py index ab838842e..118de04e8 100644 --- a/tests/app/template_folder/test_template_folder_rest.py +++ b/tests/app/template_folder/test_template_folder_rest.py @@ -102,7 +102,7 @@ def test_create_template_folder_sets_user_permissions(admin_request, sample_serv if has_parent: assert resp['data']['users_with_permission'] == [str(user_1.id)] else: - assert resp['data']['users_with_permission'] == [str(user_1.id), str(user_2.id)] + assert sorted(resp['data']['users_with_permission']) == sorted([str(user_1.id), str(user_2.id)]) @pytest.mark.parametrize('missing_field', ['name', 'parent_id'])