From f66f0a2e2d92430d6ebfec47478481086d42ff7f Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Tue, 25 May 2021 08:49:10 +0100 Subject: [PATCH] Bump moto dependency to resolve dependency conflicts --- requirements_for_test.txt | 2 +- tests/app/celery/test_scheduled_tasks.py | 2 +- tests/app/dao/test_fact_notification_status_dao.py | 2 +- tests/app/user/test_rest.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements_for_test.txt b/requirements_for_test.txt index c9862ea0a..121491ccc 100644 --- a/requirements_for_test.txt +++ b/requirements_for_test.txt @@ -2,7 +2,7 @@ flake8==3.8.4 flake8-bugbear==20.11.1 isort==5.7.0 -moto==1.3.16 +moto==2.0.8 pytest==6.1.2 pytest-env==0.6.2 pytest-mock==3.3.1 diff --git a/tests/app/celery/test_scheduled_tasks.py b/tests/app/celery/test_scheduled_tasks.py index 9e67e4920..4ece8f8ee 100644 --- a/tests/app/celery/test_scheduled_tasks.py +++ b/tests/app/celery/test_scheduled_tasks.py @@ -1,10 +1,10 @@ +import unittest.mock as mock from collections import namedtuple from datetime import datetime, timedelta from unittest.mock import call import pytest from freezegun import freeze_time -from mock import mock from app.celery import scheduled_tasks from app.celery.scheduled_tasks import ( diff --git a/tests/app/dao/test_fact_notification_status_dao.py b/tests/app/dao/test_fact_notification_status_dao.py index f807541a0..ee5d52e91 100644 --- a/tests/app/dao/test_fact_notification_status_dao.py +++ b/tests/app/dao/test_fact_notification_status_dao.py @@ -1,7 +1,7 @@ +import unittest.mock as mock from datetime import date, datetime, time, timedelta from uuid import UUID -import mock import pytest from freezegun import freeze_time diff --git a/tests/app/user/test_rest.py b/tests/app/user/test_rest.py index 15b15c734..fa1f387f5 100644 --- a/tests/app/user/test_rest.py +++ b/tests/app/user/test_rest.py @@ -1,8 +1,8 @@ import json +import unittest.mock as mock import uuid from datetime import datetime -import mock import pytest from flask import current_app, url_for from freezegun import freeze_time