From c6afd98500e9ecba0bf2d907db56b59337314b00 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Tue, 4 Jun 2019 09:08:06 -0400 Subject: [PATCH] unpin apache-libcloud now that a version is out without PyCrypto see: https://github.com/ansible/awx/pull/3466 see: https://github.com/ansible/awx/issues/3822 --- docs/licenses/{libcloud.txt => apache-libcloud.txt} | 0 requirements/requirements_ansible.in | 2 ++ requirements/requirements_ansible.txt | 1 + requirements/requirements_ansible_git.txt | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) rename docs/licenses/{libcloud.txt => apache-libcloud.txt} (100%) diff --git a/docs/licenses/libcloud.txt b/docs/licenses/apache-libcloud.txt similarity index 100% rename from docs/licenses/libcloud.txt rename to docs/licenses/apache-libcloud.txt diff --git a/requirements/requirements_ansible.in b/requirements/requirements_ansible.in index 8ac79de2e4..6d3f761635 100644 --- a/requirements/requirements_ansible.in +++ b/requirements/requirements_ansible.in @@ -1,3 +1,5 @@ +# GCE +apache-libcloud==2.5.0 # Azure # azure deps from https://github.com/ansible/ansible/blob/stable-2.8/packaging/requirements/requirements-azure.txt packaging diff --git a/requirements/requirements_ansible.txt b/requirements/requirements_ansible.txt index 8216a713c3..a4f5ff99c5 100644 --- a/requirements/requirements_ansible.txt +++ b/requirements/requirements_ansible.txt @@ -5,6 +5,7 @@ # pip-compile -U -r --allow-unsafe --output-file requirements/requirements_ansible.txt requirements/requirements_ansible.in # adal==1.2.1 # via msrestazure +apache-libcloud==2.5.0 appdirs==1.4.3 # via openstacksdk applicationinsights==0.11.9 # via azure-cli-core argcomplete==1.9.5 # via azure-cli-core, knack diff --git a/requirements/requirements_ansible_git.txt b/requirements/requirements_ansible_git.txt index a302525226..e69de29bb2 100644 --- a/requirements/requirements_ansible_git.txt +++ b/requirements/requirements_ansible_git.txt @@ -1 +0,0 @@ -git+https://github.com/ansible/libcloud@trunk#egg=apache-libcloud