From 58a1853da396d82ac76a99cb00476c6704e37a29 Mon Sep 17 00:00:00 2001 From: atoll Date: Wed, 16 Nov 2022 17:07:56 -0800 Subject: [PATCH] Restrict to responses<0.12.1 Old mock depends on an internal param removed in 0.18.0 Some sort of NoneType error added by 0.12.1 --- python-modules/cis_aws/setup.py | 2 +- python-modules/cis_change_service/setup.py | 3 ++- python-modules/cis_crypto/setup.py | 2 +- python-modules/cis_identity_vault/setup.py | 1 + python-modules/cis_notifications/setup.py | 2 +- python-modules/cis_postgresql/setup.py | 1 + python-modules/cis_processor/setup.py | 2 +- python-modules/cis_profile/setup.py | 1 + python-modules/cis_profile_retrieval_service/setup.py | 2 +- python-modules/cis_publisher/setup.py | 2 +- 10 files changed, 11 insertions(+), 7 deletions(-) diff --git a/python-modules/cis_aws/setup.py b/python-modules/cis_aws/setup.py index 56511f35..82f3cbef 100644 --- a/python-modules/cis_aws/setup.py +++ b/python-modules/cis_aws/setup.py @@ -11,7 +11,7 @@ setup_requirements = ["pytest-runner", "setuptools>=40.5.0"] test_requirements = ["jsonschema", "mock", "moto[dynamodb2,kinesis,sts]<2", "pytest", "pytest-watch", "pytest-cov", - "flake8", "botocore<1.23.24"] + "flake8", "botocore<1.23.24", "responses<0.12.1"] extras = {"test": test_requirements} diff --git a/python-modules/cis_change_service/setup.py b/python-modules/cis_change_service/setup.py index 5db17d0f..64bb0a97 100644 --- a/python-modules/cis_change_service/setup.py +++ b/python-modules/cis_change_service/setup.py @@ -23,7 +23,8 @@ setup_requirements = ["pytest-runner", "setuptools>=40.5.0"] -test_requirements = ["pytest", "pytest-watch", "pytest-cov", "patch", "mock", "flake8", "moto<2", "botocore<1.23.24"] +test_requirements = ["pytest", "pytest-watch", "pytest-cov", "patch", "mock", "flake8", "moto<2", "botocore<1.23.24", + "responses<0.12.1"] extras = {"test": test_requirements} diff --git a/python-modules/cis_crypto/setup.py b/python-modules/cis_crypto/setup.py index 144dc76c..236143e3 100644 --- a/python-modules/cis_crypto/setup.py +++ b/python-modules/cis_crypto/setup.py @@ -22,7 +22,7 @@ setup_requirements = ["pytest-runner", "setuptools>=40.5.0"] test_requirements = ["pytest", "pytest-watch", "pytest-cov", "pytest-mock", "moto[ssm]<2", "mock", "flake8", - "cis_profile", "botocore<1.23.24"] + "cis_profile", "botocore<1.23.24", "responses<0.12.1"] extras = {"test": test_requirements} diff --git a/python-modules/cis_identity_vault/setup.py b/python-modules/cis_identity_vault/setup.py index 81e00c9a..cdf3f899 100644 --- a/python-modules/cis_identity_vault/setup.py +++ b/python-modules/cis_identity_vault/setup.py @@ -35,6 +35,7 @@ "psycopg2", "psycopg2-binary", "botocore<1.23.24", + "responses<0.12.1", ] extras = {"test": test_requirements} diff --git a/python-modules/cis_notifications/setup.py b/python-modules/cis_notifications/setup.py index a75694cb..4ed341b8 100644 --- a/python-modules/cis_notifications/setup.py +++ b/python-modules/cis_notifications/setup.py @@ -11,7 +11,7 @@ setup_requirements = ["pytest-runner", "setuptools>=40.5.0"] test_requirements = ["pytest", "pytest-watch", "pytest-cov", "patch", "mock", "flake8", "moto[secretsmanager,ssm]<2", - "PyYAML", "botocore<1.23.24"] + "PyYAML", "botocore<1.23.24", "responses<0.12.1"] extras = {"test": test_requirements} diff --git a/python-modules/cis_postgresql/setup.py b/python-modules/cis_postgresql/setup.py index c4959c95..84b65468 100644 --- a/python-modules/cis_postgresql/setup.py +++ b/python-modules/cis_postgresql/setup.py @@ -22,6 +22,7 @@ "psycopg2", "psycopg2-binary", "botocore<1.23.24", + "responses<0.12.1", ] extras = {"test": test_requirements} diff --git a/python-modules/cis_processor/setup.py b/python-modules/cis_processor/setup.py index a6534b91..454f8485 100644 --- a/python-modules/cis_processor/setup.py +++ b/python-modules/cis_processor/setup.py @@ -11,7 +11,7 @@ setup_requirements = ["pytest-runner", "setuptools>=40.5.0"] test_requirements = ["pytest", "pytest-watch", "pytest-cov", "patch", "mock", "flake8", "moto[dynamodb2]<2", - "botocore<1.23.24"] + "botocore<1.23.24", "responses<0.12.1"] extras = {"test": test_requirements} diff --git a/python-modules/cis_profile/setup.py b/python-modules/cis_profile/setup.py index 49309329..cc7ebfe4 100644 --- a/python-modules/cis_profile/setup.py +++ b/python-modules/cis_profile/setup.py @@ -13,6 +13,7 @@ "flask", "flask_graphql", "flask_restful", + "responses<0.12.1", ] setup_requirements = ["pytest-runner", "setuptools>=40.5.0"] diff --git a/python-modules/cis_profile_retrieval_service/setup.py b/python-modules/cis_profile_retrieval_service/setup.py index 2ce2191d..b0c9b962 100644 --- a/python-modules/cis_profile_retrieval_service/setup.py +++ b/python-modules/cis_profile_retrieval_service/setup.py @@ -30,7 +30,7 @@ setup_requirements = ["pytest-runner", "setuptools>=40.5.0"] test_requirements = ["pytest", "pytest-watch", "pytest-cov", "pytest-mock", "moto<2", "mock", "flake8", - "botocore<1.23.24"] + "botocore<1.23.24", "responses<0.12.1"] extras = {"test": test_requirements} diff --git a/python-modules/cis_publisher/setup.py b/python-modules/cis_publisher/setup.py index 5e91a25d..3b0594e2 100644 --- a/python-modules/cis_publisher/setup.py +++ b/python-modules/cis_publisher/setup.py @@ -11,7 +11,7 @@ setup_requirements = ["pytest-runner"] test_requirements = ["pytest", "pytest-watch", "pytest-cov", "moto[lambda,ssm]<2", "flake8", "mock", - "botocore<1.23.24"] + "botocore<1.23.24", "responses<0.12.1"] extras = {"test": test_requirements}