From 1597940122e1c080df28c4917ff622fbb4a9d524 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 8 May 2020 18:51:57 +0100 Subject: [PATCH] Upgrade to boto3>=1.13.5 While testing running the test suite under Py3.7 on windows we hit an issue installing botocore at the version it was at. With this newer version of boto3 which also pulls in a newer version of botocore we got past the issue. --- requirements/static/darwin.in | 2 +- requirements/static/linux.in | 2 +- requirements/static/py3.5/darwin.txt | 6 +++--- requirements/static/py3.5/linux.txt | 6 +++--- requirements/static/py3.5/windows.txt | 6 +++--- requirements/static/py3.6/darwin.txt | 6 +++--- requirements/static/py3.6/linux.txt | 6 +++--- requirements/static/py3.6/windows.txt | 6 +++--- requirements/static/py3.7/darwin.txt | 6 +++--- requirements/static/py3.7/linux.txt | 6 +++--- requirements/static/py3.7/windows.txt | 6 +++--- requirements/static/py3.8/darwin.txt | 6 +++--- requirements/static/py3.8/linux.txt | 6 +++--- requirements/static/py3.9/darwin.txt | 6 +++--- requirements/static/py3.9/linux.txt | 6 +++--- requirements/static/windows.in | 2 +- 16 files changed, 42 insertions(+), 42 deletions(-) diff --git a/requirements/static/darwin.in b/requirements/static/darwin.in index 8ea03ccadbb..919c213e041 100644 --- a/requirements/static/darwin.in +++ b/requirements/static/darwin.in @@ -1,5 +1,5 @@ # This is a compilation of requirements installed on salt-jenkins git.salt state run -boto3 +boto3>=1.13.5 boto>=2.46.0 clustershell croniter>=0.3.0,!=0.3.22 diff --git a/requirements/static/linux.in b/requirements/static/linux.in index bd6e8a4878e..cb44d85363c 100644 --- a/requirements/static/linux.in +++ b/requirements/static/linux.in @@ -1,5 +1,5 @@ apache-libcloud==2.0.0 -boto3 +boto3>=1.13.5 boto>=2.46.0 certifi cffi diff --git a/requirements/static/py3.5/darwin.txt b/requirements/static/py3.5/darwin.txt index e75b029b336..fa00e978d44 100644 --- a/requirements/static/py3.5/darwin.txt +++ b/requirements/static/py3.5/darwin.txt @@ -14,9 +14,9 @@ aws-xray-sdk==0.95 # via moto backports.functools-lru-cache==1.5 # via cheroot backports.ssl_match_hostname==3.7.0.1 bcrypt==3.1.6 # via paramiko -boto3==1.9.132 +boto3==1.13.5 boto==2.49.0 -botocore==1.12.132 # via boto3, moto, s3transfer +botocore==1.16.5 # via boto3, moto, s3transfer cachetools==3.1.0 # via google-auth certifi==2019.3.9 certvalidator==0.11.1 # via vcert @@ -105,7 +105,7 @@ requests==2.21.0 responses==0.10.6 # via moto rfc3987==1.3.8 rsa==4.0 # via google-auth -s3transfer==0.2.0 # via boto3 +s3transfer==0.3.3 # via boto3 salttesting==2017.6.1 scp==0.13.2 # via junos-eznc setproctitle==1.1.10 diff --git a/requirements/static/py3.5/linux.txt b/requirements/static/py3.5/linux.txt index 45482137feb..cf656d12c50 100644 --- a/requirements/static/py3.5/linux.txt +++ b/requirements/static/py3.5/linux.txt @@ -12,9 +12,9 @@ attrs==19.1.0 # via pytest aws-xray-sdk==0.95 # via moto backports.functools-lru-cache==1.5 # via cheroot bcrypt==3.1.6 # via paramiko -boto3==1.9.132 +boto3==1.13.5 boto==2.49.0 -botocore==1.12.132 # via boto3, moto, s3transfer +botocore==1.16.5 # via boto3, moto, s3transfer cachetools==3.1.0 # via google-auth certifi==2019.3.9 certvalidator==0.11.1 # via vcert @@ -101,7 +101,7 @@ requests==2.21.0 responses==0.10.6 # via moto rfc3987==1.3.8 rsa==4.0 # via google-auth -s3transfer==0.2.0 # via boto3 +s3transfer==0.3.3 # via boto3 salttesting==2017.6.1 scp==0.13.2 # via junos-eznc setproctitle==1.1.10 diff --git a/requirements/static/py3.5/windows.txt b/requirements/static/py3.5/windows.txt index a108b74a9e2..810ed053436 100644 --- a/requirements/static/py3.5/windows.txt +++ b/requirements/static/py3.5/windows.txt @@ -11,9 +11,9 @@ attrs==19.1.0 # via pytest aws-xray-sdk==0.95 # via moto backports.functools-lru-cache==1.5 # via cheroot backports.ssl-match-hostname==3.7.0.1 ; python_version < "3.7" -boto3==1.9.132 +boto3==1.13.5 boto==2.49.0 -botocore==1.12.132 # via boto3, moto, s3transfer +botocore==1.16.5 # via boto3, moto, s3transfer cachetools==3.1.0 # via google-auth certifi==2019.3.9 cffi==1.12.2 @@ -97,7 +97,7 @@ requests==2.21.0 responses==0.10.6 # via moto rfc3987==1.3.8 rsa==4.0 # via google-auth -s3transfer==0.2.0 # via boto3 +s3transfer==0.3.3 # via boto3 salttesting==2017.6.1 sed==0.3.1 setproctitle==1.1.10 diff --git a/requirements/static/py3.6/darwin.txt b/requirements/static/py3.6/darwin.txt index 8a407372ec0..d92863415cd 100644 --- a/requirements/static/py3.6/darwin.txt +++ b/requirements/static/py3.6/darwin.txt @@ -14,9 +14,9 @@ aws-xray-sdk==0.95 # via moto backports.functools-lru-cache==1.5 # via cheroot backports.ssl_match_hostname==3.7.0.1 bcrypt==3.1.6 # via paramiko -boto3==1.9.132 +boto3==1.13.5 boto==2.49.0 -botocore==1.12.132 # via boto3, moto, s3transfer +botocore==1.16.5 # via boto3, moto, s3transfer cachetools==3.1.0 # via google-auth certifi==2019.3.9 certvalidator==0.11.1 # via vcert @@ -104,7 +104,7 @@ requests==2.21.0 responses==0.10.6 # via moto rfc3987==1.3.8 rsa==4.0 # via google-auth -s3transfer==0.2.0 # via boto3 +s3transfer==0.3.3 # via boto3 salttesting==2017.6.1 scp==0.13.2 # via junos-eznc setproctitle==1.1.10 diff --git a/requirements/static/py3.6/linux.txt b/requirements/static/py3.6/linux.txt index 4774427eb06..86b2c648752 100644 --- a/requirements/static/py3.6/linux.txt +++ b/requirements/static/py3.6/linux.txt @@ -12,9 +12,9 @@ attrs==19.1.0 # via pytest aws-xray-sdk==0.95 # via moto backports.functools-lru-cache==1.5 # via cheroot bcrypt==3.1.6 # via paramiko -boto3==1.9.132 +boto3==1.13.5 boto==2.49.0 -botocore==1.12.132 # via boto3, moto, s3transfer +botocore==1.16.5 # via boto3, moto, s3transfer cachetools==3.1.0 # via google-auth certifi==2019.3.9 certvalidator==0.11.1 # via vcert @@ -100,7 +100,7 @@ requests==2.21.0 responses==0.10.6 # via moto rfc3987==1.3.8 rsa==4.0 # via google-auth -s3transfer==0.2.0 # via boto3 +s3transfer==0.3.3 # via boto3 salttesting==2017.6.1 scp==0.13.2 # via junos-eznc setproctitle==1.1.10 diff --git a/requirements/static/py3.6/windows.txt b/requirements/static/py3.6/windows.txt index 8bc1701907e..eb3df08afbc 100644 --- a/requirements/static/py3.6/windows.txt +++ b/requirements/static/py3.6/windows.txt @@ -11,9 +11,9 @@ attrs==19.1.0 # via pytest aws-xray-sdk==0.95 # via moto backports.functools-lru-cache==1.5 # via cheroot backports.ssl-match-hostname==3.7.0.1 ; python_version < "3.7" -boto3==1.9.132 +boto3==1.13.5 boto==2.49.0 -botocore==1.12.132 # via boto3, moto, s3transfer +botocore==1.16.5 # via boto3, moto, s3transfer cachetools==3.1.0 # via google-auth certifi==2019.3.9 cffi==1.12.2 @@ -96,7 +96,7 @@ requests==2.21.0 responses==0.10.6 # via moto rfc3987==1.3.8 rsa==4.0 # via google-auth -s3transfer==0.2.0 # via boto3 +s3transfer==0.3.3 # via boto3 salttesting==2017.6.1 sed==0.3.1 setproctitle==1.1.10 diff --git a/requirements/static/py3.7/darwin.txt b/requirements/static/py3.7/darwin.txt index 825d8d7c1e8..57ae7d72a68 100644 --- a/requirements/static/py3.7/darwin.txt +++ b/requirements/static/py3.7/darwin.txt @@ -14,9 +14,9 @@ aws-xray-sdk==0.95 # via moto backports.functools-lru-cache==1.5 # via cheroot backports.ssl_match_hostname==3.7.0.1 bcrypt==3.1.6 # via paramiko -boto3==1.9.132 +boto3==1.13.5 boto==2.49.0 -botocore==1.12.132 # via boto3, moto, s3transfer +botocore==1.16.5 # via boto3, moto, s3transfer cachetools==3.1.0 # via google-auth certifi==2019.3.9 certvalidator==0.11.1 # via vcert @@ -103,7 +103,7 @@ requests==2.21.0 responses==0.10.6 # via moto rfc3987==1.3.8 rsa==4.0 # via google-auth -s3transfer==0.2.0 # via boto3 +s3transfer==0.3.3 # via boto3 salttesting==2017.6.1 scp==0.13.2 # via junos-eznc setproctitle==1.1.10 diff --git a/requirements/static/py3.7/linux.txt b/requirements/static/py3.7/linux.txt index 10611cf40e5..6c05159e6ac 100644 --- a/requirements/static/py3.7/linux.txt +++ b/requirements/static/py3.7/linux.txt @@ -12,9 +12,9 @@ attrs==19.1.0 # via pytest aws-xray-sdk==0.95 # via moto backports.functools-lru-cache==1.5 # via cheroot bcrypt==3.1.6 # via paramiko -boto3==1.9.132 +boto3==1.13.5 boto==2.49.0 -botocore==1.12.132 # via boto3, moto, s3transfer +botocore==1.16.5 # via boto3, moto, s3transfer cachetools==3.1.0 # via google-auth certifi==2019.3.9 certvalidator==0.11.1 # via vcert @@ -100,7 +100,7 @@ requests==2.21.0 responses==0.10.6 # via moto rfc3987==1.3.8 rsa==4.0 # via google-auth -s3transfer==0.2.0 # via boto3 +s3transfer==0.3.3 # via boto3 salttesting==2017.6.1 scp==0.13.2 # via junos-eznc setproctitle==1.1.10 diff --git a/requirements/static/py3.7/windows.txt b/requirements/static/py3.7/windows.txt index 270f169c83c..6536c6a2d48 100644 --- a/requirements/static/py3.7/windows.txt +++ b/requirements/static/py3.7/windows.txt @@ -10,9 +10,9 @@ atomicwrites==1.3.0 # via pytest attrs==19.1.0 # via pytest aws-xray-sdk==0.95 # via moto backports.functools-lru-cache==1.5 # via cheroot -boto3==1.9.132 +boto3==1.13.5 boto==2.49.0 -botocore==1.12.132 # via boto3, moto, s3transfer +botocore==1.16.5 # via boto3, moto, s3transfer cachetools==3.1.0 # via google-auth certifi==2019.3.9 cffi==1.12.2 @@ -95,7 +95,7 @@ requests==2.21.0 responses==0.10.6 # via moto rfc3987==1.3.8 rsa==4.0 # via google-auth -s3transfer==0.2.0 # via boto3 +s3transfer==0.3.3 # via boto3 salttesting==2017.6.1 sed==0.3.1 setproctitle==1.1.10 diff --git a/requirements/static/py3.8/darwin.txt b/requirements/static/py3.8/darwin.txt index 841f07ad477..2fec061549b 100644 --- a/requirements/static/py3.8/darwin.txt +++ b/requirements/static/py3.8/darwin.txt @@ -14,9 +14,9 @@ aws-xray-sdk==0.95 # via moto backports.functools-lru-cache==1.5 # via cheroot backports.ssl_match_hostname==3.7.0.1 bcrypt==3.1.6 # via paramiko -boto3==1.9.132 +boto3==1.13.5 boto==2.49.0 -botocore==1.12.132 # via boto3, moto, s3transfer +botocore==1.16.5 # via boto3, moto, s3transfer cachetools==3.1.0 # via google-auth certifi==2019.3.9 certvalidator==0.11.1 # via vcert @@ -102,7 +102,7 @@ requests==2.21.0 responses==0.10.6 # via moto rfc3987==1.3.8 rsa==4.0 # via google-auth -s3transfer==0.2.0 # via boto3 +s3transfer==0.3.3 # via boto3 salttesting==2017.6.1 scp==0.13.2 # via junos-eznc setproctitle==1.1.10 diff --git a/requirements/static/py3.8/linux.txt b/requirements/static/py3.8/linux.txt index 77f4140d47a..1745770e72a 100644 --- a/requirements/static/py3.8/linux.txt +++ b/requirements/static/py3.8/linux.txt @@ -12,9 +12,9 @@ attrs==19.1.0 # via pytest aws-xray-sdk==0.95 # via moto backports.functools-lru-cache==1.5 # via cheroot bcrypt==3.1.6 # via paramiko -boto3==1.9.132 +boto3==1.13.5 boto==2.49.0 -botocore==1.12.132 # via boto3, moto, s3transfer +botocore==1.16.5 # via boto3, moto, s3transfer cached-property==1.5.1 # via pygit2 cachetools==3.1.0 # via google-auth certifi==2019.3.9 @@ -100,7 +100,7 @@ requests==2.21.0 responses==0.10.6 # via moto rfc3987==1.3.8 rsa==4.0 # via google-auth -s3transfer==0.2.0 # via boto3 +s3transfer==0.3.3 # via boto3 salttesting==2017.6.1 scp==0.13.2 # via junos-eznc setproctitle==1.1.10 diff --git a/requirements/static/py3.9/darwin.txt b/requirements/static/py3.9/darwin.txt index 30880ba5968..2cc5dd97604 100644 --- a/requirements/static/py3.9/darwin.txt +++ b/requirements/static/py3.9/darwin.txt @@ -14,9 +14,9 @@ aws-xray-sdk==0.95 # via moto backports.functools-lru-cache==1.5 # via cheroot backports.ssl_match_hostname==3.7.0.1 bcrypt==3.1.6 # via paramiko -boto3==1.9.132 +boto3==1.13.5 boto==2.49.0 -botocore==1.12.132 # via boto3, moto, s3transfer +botocore==1.16.5 # via boto3, moto, s3transfer cachetools==3.1.0 # via google-auth certifi==2019.3.9 certvalidator==0.11.1 # via vcert @@ -102,7 +102,7 @@ requests==2.21.0 responses==0.10.6 # via moto rfc3987==1.3.8 rsa==4.0 # via google-auth -s3transfer==0.2.0 # via boto3 +s3transfer==0.3.3 # via boto3 salttesting==2017.6.1 scp==0.13.2 # via junos-eznc setproctitle==1.1.10 diff --git a/requirements/static/py3.9/linux.txt b/requirements/static/py3.9/linux.txt index ca623207cb0..de5fe8562dc 100644 --- a/requirements/static/py3.9/linux.txt +++ b/requirements/static/py3.9/linux.txt @@ -12,9 +12,9 @@ attrs==19.1.0 # via pytest aws-xray-sdk==0.95 # via moto backports.functools-lru-cache==1.5 # via cheroot bcrypt==3.1.6 # via paramiko -boto3==1.9.132 +boto3==1.13.5 boto==2.49.0 -botocore==1.12.132 # via boto3, moto, s3transfer +botocore==1.16.5 # via boto3, moto, s3transfer cached-property==1.5.1 # via pygit2 cachetools==3.1.0 # via google-auth certifi==2019.3.9 @@ -100,7 +100,7 @@ requests==2.21.0 responses==0.10.6 # via moto rfc3987==1.3.8 rsa==4.0 # via google-auth -s3transfer==0.2.0 # via boto3 +s3transfer==0.3.3 # via boto3 salttesting==2017.6.1 scp==0.13.2 # via junos-eznc setproctitle==1.1.10 diff --git a/requirements/static/windows.in b/requirements/static/windows.in index 9a774795548..4ff63776c22 100644 --- a/requirements/static/windows.in +++ b/requirements/static/windows.in @@ -1,6 +1,6 @@ # This is a compilation of requirements installed on salt-jenkins git.salt state run #apache-libcloud==2.0.0 -boto3 +boto3>=1.13.5 boto>=2.46.0 dmidecode dnspython