diff --git a/requirements/base.txt b/requirements/base.txt index d1c65e5cf..e8c9701a2 100755 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,6 +1,4 @@ -pyrsistent~=0.16.0; python_version<"3" boto3~=1.5 -enum34~=1.1; python_version<"3.4" jsonschema~=3.2 six~=1.15 diff --git a/requirements/dev.txt b/requirements/dev.txt index ee58bcfa2..eebaee996 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,19 +1,16 @@ coverage~=5.3 flake8~=3.8.4 -tox~=3.20.1 +tox~=3.24 pytest-cov~=2.10.1 -pytest-xdist~=1.34.0 # pytest-xdist 2 is not compatible with Python 2.7 +pytest-xdist~=2.5 pylint>=1.7.2,<2.0 pyyaml~=5.4 # Test requirements -pytest~=6.1.1; python_version >= '3.6' -pytest~=4.6.11; python_version < '3.6' # pytest dropped python 2 support after 4.6.x -mock>=3.0.5,<4.0.0 # 4.0.0 drops Python 2 support +pytest~=6.2.5 parameterized~=0.7.4 # Integration tests -pathlib2>=2.3.5; python_version < '3' click~=7.1 dateparser~=0.7 boto3~=1.17 @@ -25,4 +22,4 @@ requests~=2.24.0 docopt~=0.6.2 # formatter -black==20.8b1; python_version >= '3.6' +black==20.8b1 diff --git a/tests/feature_toggle/test_feature_toggle.py b/tests/feature_toggle/test_feature_toggle.py index 56a432863..a8788a4e2 100644 --- a/tests/feature_toggle/test_feature_toggle.py +++ b/tests/feature_toggle/test_feature_toggle.py @@ -1,4 +1,4 @@ -from mock import patch, Mock +from unittest.mock import patch, Mock from parameterized import parameterized, param from unittest import TestCase import os, sys diff --git a/tests/intrinsics/test_actions.py b/tests/intrinsics/test_actions.py index 4152fa3b7..abe4afa61 100644 --- a/tests/intrinsics/test_actions.py +++ b/tests/intrinsics/test_actions.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import patch, Mock +from unittest.mock import patch, Mock from samtranslator.intrinsics.actions import Action, RefAction, SubAction, GetAttAction, FindInMapAction from samtranslator.intrinsics.resource_refs import SupportedResourceReferences from samtranslator.model.exceptions import InvalidTemplateException, InvalidDocumentException diff --git a/tests/intrinsics/test_resolver.py b/tests/intrinsics/test_resolver.py index 946307b87..e06186051 100644 --- a/tests/intrinsics/test_resolver.py +++ b/tests/intrinsics/test_resolver.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import Mock, patch +from unittest.mock import Mock, patch from samtranslator.intrinsics.resolver import IntrinsicsResolver from samtranslator.intrinsics.actions import Action from samtranslator.model.exceptions import InvalidDocumentException diff --git a/tests/metrics/test_method_decorator.py b/tests/metrics/test_method_decorator.py index 05fbd16ff..f864eeeae 100644 --- a/tests/metrics/test_method_decorator.py +++ b/tests/metrics/test_method_decorator.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import Mock, patch, ANY +from unittest.mock import Mock, patch, ANY from samtranslator.metrics.method_decorator import ( MetricsMethodWrapperSingleton, diff --git a/tests/metrics/test_metrics.py b/tests/metrics/test_metrics.py index aafa151fc..55cc29123 100644 --- a/tests/metrics/test_metrics.py +++ b/tests/metrics/test_metrics.py @@ -1,6 +1,6 @@ from parameterized import parameterized, param from unittest import TestCase -from mock import MagicMock, call, ANY +from unittest.mock import MagicMock, call, ANY from samtranslator.metrics.metrics import ( Metrics, MetricsPublisher, diff --git a/tests/model/api/test_api_generator.py b/tests/model/api/test_api_generator.py index ca0573f04..391b3606f 100644 --- a/tests/model/api/test_api_generator.py +++ b/tests/model/api/test_api_generator.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import Mock, patch +from unittest.mock import Mock, patch from parameterized import parameterized diff --git a/tests/model/api/test_http_api_generator.py b/tests/model/api/test_http_api_generator.py index e5672933f..03030b1f7 100644 --- a/tests/model/api/test_http_api_generator.py +++ b/tests/model/api/test_http_api_generator.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import patch +from unittest.mock import patch import pytest from functools import reduce diff --git a/tests/model/eventsources/test_api_event_source.py b/tests/model/eventsources/test_api_event_source.py index 6357e1d69..bb8bf11e8 100644 --- a/tests/model/eventsources/test_api_event_source.py +++ b/tests/model/eventsources/test_api_event_source.py @@ -1,4 +1,4 @@ -from mock import Mock, patch +from unittest.mock import Mock, patch from unittest import TestCase from samtranslator.model.eventsources.push import Api diff --git a/tests/model/eventsources/test_cloudwatch_event_source.py b/tests/model/eventsources/test_cloudwatch_event_source.py index b323263aa..510f02571 100644 --- a/tests/model/eventsources/test_cloudwatch_event_source.py +++ b/tests/model/eventsources/test_cloudwatch_event_source.py @@ -1,4 +1,4 @@ -from mock import Mock, patch +from unittest.mock import Mock, patch from unittest import TestCase from samtranslator.model.eventsources.push import CloudWatchEvent diff --git a/tests/model/eventsources/test_cloudwatchlogs_event_source.py b/tests/model/eventsources/test_cloudwatchlogs_event_source.py index 4f8f8b707..4d3b71348 100644 --- a/tests/model/eventsources/test_cloudwatchlogs_event_source.py +++ b/tests/model/eventsources/test_cloudwatchlogs_event_source.py @@ -1,4 +1,4 @@ -from mock import Mock, patch +from unittest.mock import Mock, patch from unittest import TestCase from samtranslator.model.eventsources.cloudwatchlogs import CloudWatchLogs diff --git a/tests/model/eventsources/test_eventbridge_rule_source.py b/tests/model/eventsources/test_eventbridge_rule_source.py index e1d031d4c..b4a71bcce 100644 --- a/tests/model/eventsources/test_eventbridge_rule_source.py +++ b/tests/model/eventsources/test_eventbridge_rule_source.py @@ -1,4 +1,4 @@ -from mock import Mock, patch +from unittest.mock import Mock, patch from unittest import TestCase from samtranslator.model.eventsources.push import EventBridgeRule diff --git a/tests/model/eventsources/test_schedule_event_source.py b/tests/model/eventsources/test_schedule_event_source.py index 3bf1b373d..2dff522ca 100644 --- a/tests/model/eventsources/test_schedule_event_source.py +++ b/tests/model/eventsources/test_schedule_event_source.py @@ -1,4 +1,4 @@ -from mock import Mock, patch +from unittest.mock import Mock, patch from unittest import TestCase from samtranslator.model.eventsources.push import Schedule diff --git a/tests/model/eventsources/test_sns_event_source.py b/tests/model/eventsources/test_sns_event_source.py index 711f2ce22..1bd72516f 100644 --- a/tests/model/eventsources/test_sns_event_source.py +++ b/tests/model/eventsources/test_sns_event_source.py @@ -1,4 +1,4 @@ -from mock import Mock +from unittest.mock import Mock from unittest import TestCase from samtranslator.model.eventsources.push import SNS diff --git a/tests/model/stepfunctions/test_api_event.py b/tests/model/stepfunctions/test_api_event.py index cc0457dac..add6b3600 100644 --- a/tests/model/stepfunctions/test_api_event.py +++ b/tests/model/stepfunctions/test_api_event.py @@ -1,4 +1,4 @@ -from mock import Mock +from unittest.mock import Mock from unittest import TestCase from samtranslator.model.stepfunctions.events import Api diff --git a/tests/model/stepfunctions/test_cloudwatchevents_event.py b/tests/model/stepfunctions/test_cloudwatchevents_event.py index 33c74928e..c0957a7d2 100644 --- a/tests/model/stepfunctions/test_cloudwatchevents_event.py +++ b/tests/model/stepfunctions/test_cloudwatchevents_event.py @@ -1,4 +1,4 @@ -from mock import Mock +from unittest.mock import Mock from unittest import TestCase from samtranslator.model.stepfunctions.events import CloudWatchEvent from samtranslator.model.exceptions import InvalidEventException diff --git a/tests/model/stepfunctions/test_eventbridge_rule_source.py b/tests/model/stepfunctions/test_eventbridge_rule_source.py index 254a91fcc..8e1ef412e 100644 --- a/tests/model/stepfunctions/test_eventbridge_rule_source.py +++ b/tests/model/stepfunctions/test_eventbridge_rule_source.py @@ -1,4 +1,4 @@ -from mock import Mock +from unittest.mock import Mock from unittest import TestCase from samtranslator.model.exceptions import InvalidEventException diff --git a/tests/model/stepfunctions/test_schedule_event.py b/tests/model/stepfunctions/test_schedule_event.py index 423defd23..234cd3879 100644 --- a/tests/model/stepfunctions/test_schedule_event.py +++ b/tests/model/stepfunctions/test_schedule_event.py @@ -1,4 +1,4 @@ -from mock import Mock +from unittest.mock import Mock from unittest import TestCase from samtranslator.model.stepfunctions.events import Schedule from samtranslator.model.exceptions import InvalidEventException diff --git a/tests/model/stepfunctions/test_state_machine_generator.py b/tests/model/stepfunctions/test_state_machine_generator.py index 39f688367..cf5f747e6 100644 --- a/tests/model/stepfunctions/test_state_machine_generator.py +++ b/tests/model/stepfunctions/test_state_machine_generator.py @@ -1,4 +1,4 @@ -from mock import Mock +from unittest.mock import Mock from unittest import TestCase from samtranslator.model import ResourceTypeResolver diff --git a/tests/model/test_api_v2.py b/tests/model/test_api_v2.py index 7299f6ba0..1d5428b8e 100644 --- a/tests/model/test_api_v2.py +++ b/tests/model/test_api_v2.py @@ -1,6 +1,6 @@ from unittest import TestCase +from unittest import mock import pytest -import mock from samtranslator.model import InvalidResourceException from samtranslator.model.apigatewayv2 import ApiGatewayV2Authorizer diff --git a/tests/model/test_function_policies.py b/tests/model/test_function_policies.py index bcbe7f152..d2405284c 100644 --- a/tests/model/test_function_policies.py +++ b/tests/model/test_function_policies.py @@ -1,4 +1,4 @@ -from mock import Mock, patch +from unittest.mock import Mock, patch from unittest import TestCase from samtranslator.model.function_policies import FunctionPolicies, PolicyTypes, PolicyEntry diff --git a/tests/model/test_resource_policies.py b/tests/model/test_resource_policies.py index 8c2731c2c..ff3bfb163 100644 --- a/tests/model/test_resource_policies.py +++ b/tests/model/test_resource_policies.py @@ -1,4 +1,4 @@ -from mock import Mock, patch +from unittest.mock import Mock, patch from unittest import TestCase from samtranslator.model.resource_policies import ResourcePolicies, PolicyTypes, PolicyEntry diff --git a/tests/model/test_sam_resources.py b/tests/model/test_sam_resources.py index 2b2fd808c..b2c639aff 100644 --- a/tests/model/test_sam_resources.py +++ b/tests/model/test_sam_resources.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import patch +from unittest.mock import patch import pytest from samtranslator.intrinsics.resolver import IntrinsicsResolver diff --git a/tests/parser/test_parser.py b/tests/parser/test_parser.py index 43e67a1de..49fa6b0eb 100644 --- a/tests/parser/test_parser.py +++ b/tests/parser/test_parser.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import patch, Mock, call +from unittest.mock import patch, Mock, call from samtranslator.parser.parser import Parser from samtranslator.plugins import LifeCycleEvents diff --git a/tests/plugins/api/test_default_definition_body_plugin.py b/tests/plugins/api/test_default_definition_body_plugin.py index ad6e1648c..76ab86830 100644 --- a/tests/plugins/api/test_default_definition_body_plugin.py +++ b/tests/plugins/api/test_default_definition_body_plugin.py @@ -1,4 +1,4 @@ -from mock import Mock, patch +from unittest.mock import Mock, patch from unittest import TestCase from samtranslator.plugins.api.default_definition_body_plugin import DefaultDefinitionBodyPlugin diff --git a/tests/plugins/api/test_implicit_api_plugin.py b/tests/plugins/api/test_implicit_api_plugin.py index 1ad927212..e3e27fabd 100644 --- a/tests/plugins/api/test_implicit_api_plugin.py +++ b/tests/plugins/api/test_implicit_api_plugin.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import Mock, patch, call +from unittest.mock import Mock, patch, call from samtranslator.public.sdk.resource import SamResource, SamResourceType from samtranslator.public.exceptions import InvalidEventException, InvalidResourceException, InvalidDocumentException diff --git a/tests/plugins/application/test_serverless_app_plugin.py b/tests/plugins/application/test_serverless_app_plugin.py index c130bb76b..5b56846db 100644 --- a/tests/plugins/application/test_serverless_app_plugin.py +++ b/tests/plugins/application/test_serverless_app_plugin.py @@ -2,7 +2,7 @@ import itertools from botocore.exceptions import ClientError -from mock import Mock, patch +from unittest.mock import Mock, patch from unittest import TestCase from parameterized import parameterized, param diff --git a/tests/plugins/globals/test_globals.py b/tests/plugins/globals/test_globals.py index eef6123ec..d020f26b0 100644 --- a/tests/plugins/globals/test_globals.py +++ b/tests/plugins/globals/test_globals.py @@ -1,7 +1,7 @@ from parameterized import parameterized from unittest import TestCase -from mock import patch, Mock +from unittest.mock import patch, Mock from samtranslator.plugins.globals.globals import GlobalProperties, Globals, InvalidGlobalsSectionException diff --git a/tests/plugins/globals/test_globals_plugin.py b/tests/plugins/globals/test_globals_plugin.py index 925211d01..55e772332 100644 --- a/tests/plugins/globals/test_globals_plugin.py +++ b/tests/plugins/globals/test_globals_plugin.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import patch +from unittest.mock import patch from samtranslator.public.exceptions import InvalidDocumentException from samtranslator.public.plugins import BasePlugin diff --git a/tests/plugins/policies/test_policy_templates_plugin.py b/tests/plugins/policies/test_policy_templates_plugin.py index ce16bc92a..373d7ea6a 100644 --- a/tests/plugins/policies/test_policy_templates_plugin.py +++ b/tests/plugins/policies/test_policy_templates_plugin.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import Mock, MagicMock, patch, call +from unittest.mock import Mock, MagicMock, patch, call from samtranslator.plugins import BasePlugin from samtranslator.model.resource_policies import PolicyTypes, PolicyEntry diff --git a/tests/policy_template_processor/test_processor.py b/tests/policy_template_processor/test_processor.py index 9319080f4..ed1441480 100644 --- a/tests/policy_template_processor/test_processor.py +++ b/tests/policy_template_processor/test_processor.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import mock_open, Mock, patch +from unittest.mock import mock_open, Mock, patch import jsonschema import json diff --git a/tests/policy_template_processor/test_template.py b/tests/policy_template_processor/test_template.py index 9753b3539..03b5858cc 100644 --- a/tests/policy_template_processor/test_template.py +++ b/tests/policy_template_processor/test_template.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import Mock, patch, ANY +from unittest.mock import Mock, patch, ANY from samtranslator.policy_template_processor.template import Template from samtranslator.policy_template_processor.exceptions import InvalidParameterValues, InsufficientParameterValues diff --git a/tests/sdk/test_parameter.py b/tests/sdk/test_parameter.py index afcc3ccc1..d8f24f3af 100644 --- a/tests/sdk/test_parameter.py +++ b/tests/sdk/test_parameter.py @@ -2,7 +2,7 @@ from unittest import TestCase from samtranslator.sdk.parameter import SamParameterValues -from mock import patch, Mock +from unittest.mock import patch, Mock from samtranslator.translator.arn_generator import NoRegionFound diff --git a/tests/swagger/test_swagger.py b/tests/swagger/test_swagger.py index 0a50d6a7b..346754369 100644 --- a/tests/swagger/test_swagger.py +++ b/tests/swagger/test_swagger.py @@ -1,7 +1,7 @@ import copy from unittest import TestCase -from mock import Mock +from unittest.mock import Mock from parameterized import parameterized, param from samtranslator.swagger.swagger import SwaggerEditor diff --git a/tests/test_model.py b/tests/test_model.py index 9783be7b5..4ec844032 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1,7 +1,7 @@ import pytest from unittest import TestCase -from mock import Mock, call, ANY +from unittest.mock import Mock, call, ANY from samtranslator.model.exceptions import InvalidResourceException from samtranslator.model import PropertyType, Resource, SamResourceMacro, ResourceTypeResolver from samtranslator.intrinsics.resource_refs import SupportedResourceReferences diff --git a/tests/test_plugins.py b/tests/test_plugins.py index a1bfb97ab..79f7080d9 100644 --- a/tests/test_plugins.py +++ b/tests/test_plugins.py @@ -2,7 +2,7 @@ from samtranslator.plugins import SamPlugins, BasePlugin, LifeCycleEvents from unittest import TestCase -from mock import Mock, patch, call +from unittest.mock import Mock, patch, call class TestSamPluginsRegistration(TestCase): diff --git a/tests/translator/model/preferences/test_deployment_preference_collection.py b/tests/translator/model/preferences/test_deployment_preference_collection.py index 1d9b14b2d..6ca0d2c59 100644 --- a/tests/translator/model/preferences/test_deployment_preference_collection.py +++ b/tests/translator/model/preferences/test_deployment_preference_collection.py @@ -1,4 +1,4 @@ -from mock import patch +from unittest.mock import patch from unittest import TestCase from samtranslator.model.codedeploy import CodeDeployApplication diff --git a/tests/translator/test_api_resource.py b/tests/translator/test_api_resource.py index 41be5fddb..ca00bf376 100644 --- a/tests/translator/test_api_resource.py +++ b/tests/translator/test_api_resource.py @@ -2,7 +2,7 @@ import os from unittest import TestCase -from mock import MagicMock, patch +from unittest.mock import MagicMock, patch from tests.translator.helpers import get_template_parameter_values from samtranslator.translator.transform import transform from samtranslator.model.apigateway import ApiGatewayDeployment diff --git a/tests/translator/test_arn_generator.py b/tests/translator/test_arn_generator.py index 200f90414..7a0bfc65c 100644 --- a/tests/translator/test_arn_generator.py +++ b/tests/translator/test_arn_generator.py @@ -1,6 +1,6 @@ from unittest import TestCase from parameterized import parameterized -from mock import patch +from unittest.mock import patch from samtranslator.translator.arn_generator import ArnGenerator, NoRegionFound diff --git a/tests/translator/test_function_resources.py b/tests/translator/test_function_resources.py index aa2d57f4e..279668155 100644 --- a/tests/translator/test_function_resources.py +++ b/tests/translator/test_function_resources.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import patch, Mock +from unittest.mock import patch, Mock import os from samtranslator.model.sam_resources import SamFunction from samtranslator.model.lambda_ import LambdaAlias, LambdaVersion, LambdaFunction diff --git a/tests/translator/test_logical_id_generator.py b/tests/translator/test_logical_id_generator.py index 65607defb..06634495a 100644 --- a/tests/translator/test_logical_id_generator.py +++ b/tests/translator/test_logical_id_generator.py @@ -2,7 +2,7 @@ import json from unittest import TestCase -from mock import patch +from unittest.mock import patch from samtranslator.translator.logical_id_generator import LogicalIdGenerator diff --git a/tests/translator/test_managed_policies_translator.py b/tests/translator/test_managed_policies_translator.py index 195db3a38..811f2533f 100644 --- a/tests/translator/test_managed_policies_translator.py +++ b/tests/translator/test_managed_policies_translator.py @@ -1,4 +1,4 @@ -from mock import MagicMock +from unittest.mock import MagicMock from samtranslator.translator.managed_policy_translator import ManagedPolicyLoader diff --git a/tests/translator/test_resource_level_attributes.py b/tests/translator/test_resource_level_attributes.py index 58754fe92..0f8df442d 100644 --- a/tests/translator/test_resource_level_attributes.py +++ b/tests/translator/test_resource_level_attributes.py @@ -1,5 +1,5 @@ import itertools -from mock import patch +from unittest.mock import patch from parameterized import parameterized diff --git a/tests/translator/test_translator.py b/tests/translator/test_translator.py index 44d7b2274..4ea9aaa51 100644 --- a/tests/translator/test_translator.py +++ b/tests/translator/test_translator.py @@ -22,7 +22,7 @@ import yaml from unittest import TestCase from samtranslator.translator.transform import transform -from mock import Mock, MagicMock, patch +from unittest.mock import Mock, MagicMock, patch BASE_PATH = os.path.dirname(__file__) INPUT_FOLDER = BASE_PATH + "/input" diff --git a/tests/unit/model/preferences/test_deployment_preference_collection.py b/tests/unit/model/preferences/test_deployment_preference_collection.py index 3412b9f5c..0ab04c949 100644 --- a/tests/unit/model/preferences/test_deployment_preference_collection.py +++ b/tests/unit/model/preferences/test_deployment_preference_collection.py @@ -1,6 +1,6 @@ from unittest import TestCase -from mock import patch +from unittest.mock import patch from parameterized import parameterized from samtranslator.model.preferences.deployment_preference_collection import DeploymentPreferenceCollection diff --git a/tests/unit/test_region_configuration.py b/tests/unit/test_region_configuration.py index 646b0c136..ac45832f4 100644 --- a/tests/unit/test_region_configuration.py +++ b/tests/unit/test_region_configuration.py @@ -1,6 +1,6 @@ from unittest import TestCase -from mock import patch +from unittest.mock import patch from parameterized import parameterized from samtranslator.region_configuration import RegionConfiguration diff --git a/tests/unit/translator/test_arn_generator.py b/tests/unit/translator/test_arn_generator.py index 3d0d33016..65a6d201b 100644 --- a/tests/unit/translator/test_arn_generator.py +++ b/tests/unit/translator/test_arn_generator.py @@ -1,6 +1,6 @@ from unittest import TestCase -from mock import patch +from unittest.mock import patch from parameterized import parameterized from samtranslator.translator.arn_generator import ArnGenerator diff --git a/tests/utils/test_py27hash_fix.py b/tests/utils/test_py27hash_fix.py index 8d59aa940..55c6b0d56 100644 --- a/tests/utils/test_py27hash_fix.py +++ b/tests/utils/test_py27hash_fix.py @@ -1,7 +1,7 @@ import copy from unittest import TestCase -from mock import patch +from unittest.mock import patch from samtranslator.utils.py27hash_fix import ( Py27Dict, Py27Keys,