From a2c2dffcebb757d3ae4f259d01e3c2b52eb34e93 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Thu, 18 Oct 2018 13:05:29 -0700 Subject: [PATCH] Add constraint for requests on python 2.6. (#47306) * Add constraint for requests on python 2.6. * Use constraints in lookup_hashi_vault test. (cherry picked from commit f74f7b03736a4b600e85ccad090f941595b47f6b) --- .../lookup_hashi_vault/playbooks/install_dependencies.yml | 1 + test/runner/requirements/constraints.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/test/integration/targets/lookup_hashi_vault/playbooks/install_dependencies.yml b/test/integration/targets/lookup_hashi_vault/playbooks/install_dependencies.yml index 49c250462f2..ad3d8afb878 100644 --- a/test/integration/targets/lookup_hashi_vault/playbooks/install_dependencies.yml +++ b/test/integration/targets/lookup_hashi_vault/playbooks/install_dependencies.yml @@ -17,3 +17,4 @@ - name: 'Install hvac Python package' pip: name: "{{ hvac_package|default('hvac') }}" + extra_args: "-c {{ playbook_dir }}/../../../../runner/requirements/constraints.txt" diff --git a/test/runner/requirements/constraints.txt b/test/runner/requirements/constraints.txt index 65e123705f9..90ddd3bcc28 100644 --- a/test/runner/requirements/constraints.txt +++ b/test/runner/requirements/constraints.txt @@ -15,6 +15,7 @@ idna < 2.6 # requests requires idna < 2.6, but cryptography will cause the lates paramiko < 2.4.0 ; python_version < '2.7' # paramiko 2.4.0 drops support for python 2.6 pytest < 3.3.0 ; python_version < '2.7' # pytest 3.3.0 drops support for python 2.6 ntlm-auth >= 1.0.6 # message encryption support +requests < 2.20.0 ; python_version < '2.7' # requests 2.20.0 drops support for python 2.6 requests-ntlm >= 1.1.0 # message encryption support requests-credssp >= 0.1.0 # message encryption support voluptuous >= 0.11.0 # Schema recursion via Self