diff --git a/moto/__init__.py b/moto/__init__.py index df283fc6..be06a896 100644 --- a/moto/__init__.py +++ b/moto/__init__.py @@ -5,6 +5,7 @@ logging.getLogger('boto').setLevel(logging.CRITICAL) __title__ = 'moto' __version__ = '0.4.22' +from .apigateway import mock_apigateway # flake8: noqa from .autoscaling import mock_autoscaling # flake8: noqa from .awslambda import mock_lambda # flake8: noqa from .cloudformation import mock_cloudformation # flake8: noqa @@ -31,3 +32,9 @@ from .sqs import mock_sqs # flake8: noqa from .sts import mock_sts # flake8: noqa from .route53 import mock_route53 # flake8: noqa from .swf import mock_swf # flake8: noqa + + +# Need to monkey-patch botocore requests back to underlying urllib3 classes +from botocore.awsrequest import HTTPSConnectionPool, HTTPConnectionPool, HTTPConnection, VerifiedHTTPSConnection +HTTPSConnectionPool.ConnectionCls = VerifiedHTTPSConnection +HTTPConnectionPool.ConnectionCls = HTTPConnection diff --git a/requirements-dev.txt b/requirements-dev.txt index a75fdcfb..7bc50636 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -7,6 +7,6 @@ freezegun flask # botocore 1.3.29 breaks s3 in tests (lambda and s3 tests) # so we need to pin a boto3 and botocore revision pair that we know works -boto3==1.2.4 -botocore==1.3.28 +boto3#==1.2.4 +botocore#==1.3.28 six