diff --git a/bindep.txt b/bindep.txt new file mode 100644 index 00000000000..a336e642f5f --- /dev/null +++ b/bindep.txt @@ -0,0 +1,4 @@ +# Needed for generating EC2 format fingerprints +openssl [test platform:rpm] +gcc [test platform:rpm] +python3-devel [test platform:rpm] diff --git a/requirements.txt b/requirements.txt index 8b7f0397090..3685e404330 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,8 @@ -boto>=2.49.0 +# When updating the minimal requirements please also update +# - tests/unit/constraints.txt +# - tests/integration/constraints.txt +# - tests/integration/targets/setup_botocore_pip botocore>=1.18.0 boto3>=1.15.0 +# Final released version +boto>=2.49.0 diff --git a/test-requirements.txt b/test-requirements.txt index 3d217284154..77c76b86509 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,3 +1,7 @@ +botocore +boto3 +boto + coverage==4.5.4 placebo mock @@ -8,3 +12,5 @@ pytest-mock netaddr # Sometimes needed where we don't have features we need in modules awscli +# Used for comparing SSH Public keys to the Amazon fingerprints +pycrypto diff --git a/tests/integration/constraints.txt b/tests/integration/constraints.txt index c105f290280..bd95eb26733 100644 --- a/tests/integration/constraints.txt +++ b/tests/integration/constraints.txt @@ -1,3 +1,7 @@ -boto3 >= 1.9.250, <= 1.15.18 # minimum version that supports botocore 1.13.3, max that will work with ansible 2.9's other constraints -botocore<1.19.0,>=1.13.3 # adds support for ECR image scanning +# Specifically run tests against the oldest versions that we support +boto3==1.15.0 +botocore==1.18.0 +# AWS CLI has `botocore==` dependencies, provide the one that matches botocore +# to avoid needing to download over a years worth of awscli wheels. +awscli==1.18.141 diff --git a/tests/integration/requirements.txt b/tests/integration/requirements.txt index 2fb8f547d8a..6e870975a35 100644 --- a/tests/integration/requirements.txt +++ b/tests/integration/requirements.txt @@ -1,5 +1,12 @@ +# Our code is based on the AWS SDKs +boto +boto3 +botocore + # netaddr is needed for ansible.netcommon.ipv6 netaddr virtualenv -boto3 -botocore +# Sometimes needed where we don't have features we need in modules +awscli +# Used for comparing SSH Public keys to the Amazon fingerprints +pycrypto diff --git a/tests/unit/constraints.txt b/tests/unit/constraints.txt new file mode 100644 index 00000000000..bd95eb26733 --- /dev/null +++ b/tests/unit/constraints.txt @@ -0,0 +1,7 @@ +# Specifically run tests against the oldest versions that we support +boto3==1.15.0 +botocore==1.18.0 + +# AWS CLI has `botocore==` dependencies, provide the one that matches botocore +# to avoid needing to download over a years worth of awscli wheels. +awscli==1.18.141 diff --git a/tests/unit/requirements.txt b/tests/unit/requirements.txt index 7a0fc97967f..704c73a25b2 100644 --- a/tests/unit/requirements.txt +++ b/tests/unit/requirements.txt @@ -1,3 +1,6 @@ +# Our code is based on the AWS SDKs +botocore +boto3 +boto + placebo -botocore>=1.18.0 -boto3>=1.15.0