diff --git a/requirements/requirements.in b/requirements/requirements.in index 23ca0537c1..886476fecb 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -33,12 +33,14 @@ psphere==0.5.2 psutil==5.0.0 pygerduty==0.35.1 pyOpenSSL==16.2.0 +python-logstash==0.4.6 python-memcached==1.58 python-radius==1.0 python-saml==2.2.0 python-social-auth==0.2.21 pyzmq==14.5.0 redbaron==0.6.2 +requests-futures==0.9.7 shade==1.13.1 slackclient==1.0.2 twilio==5.6.0 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index d6f887735e..20319bdb8b 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -4,11 +4,6 @@ # # pip-compile --output-file requirements.txt requirements.in # -git+https://github.com/ansible/ansiconv.git@tower_1.0.0#egg=ansiconv -git+https://github.com/ansible/django-qsstats-magic.git@tower_0.7.2#egg=django-qsstats-magic -git+https://github.com/ansible/dm.xmlsec.binding.git@master#egg=dm.xmlsec.binding -git+https://github.com/ansible/django-jsonbfield@master#egg=jsonbfield -git+https://github.com/chrismeyersfsu/pyrax@tower#egg=pyrax amqp==1.4.9 # via kombu anyjson==0.3.3 # via kombu apache-libcloud==1.3.0 @@ -17,7 +12,7 @@ asgi-amqp==0.3.1 asgiref==1.0.0 # via asgi-amqp, channels, daphne autobahn==0.16.1 # via daphne azure-batch==1.0.0 # via azure -azure-common[autorest]==1.1.4 # via azure-batch, azure-mgmt-batch, azure-mgmt-compute, azure-mgmt-keyvault, azure-mgmt-logic, azure-mgmt-network, azure-mgmt-redis, azure-mgmt-resource, azure-mgmt-scheduler, azure-mgmt-storage, azure-servicebus, azure-servicemanagement-legacy, azure-storage +azure-common==1.1.4 # via azure-batch, azure-mgmt-batch, azure-mgmt-compute, azure-mgmt-keyvault, azure-mgmt-logic, azure-mgmt-network, azure-mgmt-redis, azure-mgmt-resource, azure-mgmt-scheduler, azure-mgmt-storage, azure-servicebus, azure-servicemanagement-legacy, azure-storage azure-mgmt-batch==1.0.0 # via azure-mgmt azure-mgmt-compute==0.30.0rc6 # via azure-mgmt azure-mgmt-keyvault==0.30.0rc6 # via azure-mgmt @@ -48,7 +43,7 @@ chardet==2.3.0 # via msrest cliff==2.3.0 # via osc-lib, python-designateclient, python-heatclient, python-mistralclient, python-neutronclient, python-openstackclient cmd2==0.6.9 # via cliff constantly==15.1.0 # via twisted -cryptography==1.5.3 # via azure-storage, pyopenssl, python-magnumclient, secretstorage +cryptography==1.6 # via azure-storage, pyopenssl, python-magnumclient, secretstorage daphne==0.15.0 # via channels debtcollector==1.9.0 # via oslo.config, oslo.utils, python-designateclient, python-keystoneclient, python-neutronclient decorator==4.0.10 # via python-magnumclient, shade @@ -71,7 +66,7 @@ dogpile.cache==0.6.2 # via python-ironicclient, shade enum34==1.1.6 # via cryptography, msrest funcsigs==1.0.2 # via debtcollector, mock, oslo.utils functools32==3.2.3.post2 # via jsonschema -futures==3.0.5 # via azure-storage, python-swiftclient +futures==3.0.5 # via azure-storage, python-swiftclient, requests-futures gevent-websocket==0.9.5 gevent==1.1.2 # via gevent-websocket greenlet==0.4.10 # via gevent @@ -111,7 +106,7 @@ msrestazure==0.4.4 # via azure-common munch==2.0.4 # via shade netaddr==0.7.18 # via oslo.config, oslo.utils, python-neutronclient netifaces==0.10.5 # via oslo.utils, shade -oauthlib==2.0.0 # via python-social-auth, requests-oauthlib +oauthlib==2.0.1 # via python-social-auth, requests-oauthlib openstacksdk==0.9.10 # via python-openstackclient ordereddict==1.1 os-client-config==1.24.0 # via openstacksdk, osc-lib, python-magnumclient, python-neutronclient, shade @@ -141,10 +136,10 @@ python-cinderclient==1.9.0 # via python-openstackclient, shade python-dateutil==2.6.0 # via azure-storage python-designateclient==2.3.0 # via shade python-glanceclient==2.5.0 # via python-openstackclient, shade -python-heatclient==1.6.0 # via shade +python-heatclient==1.6.1 # via shade python-ironicclient==1.8.0 # via shade -python-keystoneclient==3.6.0 # via python-glanceclient, python-mistralclient, python-openstackclient, shade -python-ldap==2.4.27 # via django-auth-ldap +python-keystoneclient==3.7.0 # via python-glanceclient, python-mistralclient, python-openstackclient, shade +python-ldap==2.4.28 # via django-auth-ldap python-logstash==0.4.6 python-magnumclient==2.3.1 # via shade python-memcached==1.58 @@ -152,7 +147,7 @@ python-mistralclient==2.1.1 # via python-troveclient python-neutronclient==6.0.0 # via shade python-novaclient==6.0.0 # via ip-associations-python-novaclient-ext, os-diskconfig-python-novaclient-ext, os-networksv2-python-novaclient-ext, os-virtual-interfacesv2-python-novaclient-ext, python-openstackclient, rackspace-auth-openstack, rackspace-novaclient, rax-default-network-flags-python-novaclient-ext, rax-scheduled-images-python-novaclient-ext, shade python-openid==2.2.5 # via python-social-auth -python-openstackclient==3.4.0 # via python-ironicclient +python-openstackclient==3.4.1 # via python-ironicclient python-radius==1.0 python-saml==2.2.0 python-social-auth==0.2.21 @@ -166,9 +161,9 @@ rackspace-novaclient==2.1 rax-default-network-flags-python-novaclient-ext==0.4.0 # via rackspace-novaclient rax-scheduled-images-python-novaclient-ext==0.3.1 # via rackspace-novaclient redbaron==0.6.2 -requests-oauthlib==0.7.0 # via msrest, python-social-auth -requests==2.12.1 # via azure-servicebus, azure-servicemanagement-legacy, azure-storage, keystoneauth1, msrest, python-cinderclient, python-designateclient, python-glanceclient, python-heatclient, python-ironicclient, python-keystoneclient, python-magnumclient, python-mistralclient, python-neutronclient, python-novaclient, python-social-auth, python-swiftclient, python-troveclient, requests-oauthlib, slackclient requests-futures==0.9.7 +requests-oauthlib==0.7.0 # via msrest, python-social-auth +requests==2.12.1 # via azure-servicebus, azure-servicemanagement-legacy, azure-storage, keystoneauth1, msrest, python-cinderclient, python-designateclient, python-glanceclient, python-heatclient, python-ironicclient, python-keystoneclient, python-magnumclient, python-mistralclient, python-neutronclient, python-novaclient, python-social-auth, python-swiftclient, python-troveclient, requests-futures, requests-oauthlib, slackclient requestsexceptions==1.1.3 # via os-client-config, shade rfc3986==0.4.1 # via oslo.config rply==0.7.4 # via baron @@ -181,7 +176,7 @@ stevedore==1.18.0 # via cliff, keystoneauth1, openstacksdk, osc-lib, osl suds==0.4 # via psphere tempora==1.6.1 # via irc, jaraco.logging twilio==5.6.0 -twisted==16.5.0 # via daphne +twisted==16.6.0 # via daphne txaio==2.5.2 # via autobahn typing==3.5.2.2 # via m2crypto unicodecsv==0.14.1 # via cliff diff --git a/requirements/requirements_ansible.in b/requirements/requirements_ansible.in index b5b62a15e4..2e2085985b 100644 --- a/requirements/requirements_ansible.in +++ b/requirements/requirements_ansible.in @@ -1,6 +1,7 @@ -e git+https://github.com/chrismeyersfsu/pyrax@tower#egg=pyrax apache-libcloud==1.3.0 azure==2.0.0rc6 +kombu==3.0.35 boto==2.43.0 psutil==5.0.0 shade==1.13.1 diff --git a/requirements/requirements_ansible.txt b/requirements/requirements_ansible.txt index 714f2a827d..d11dac50a1 100644 --- a/requirements/requirements_ansible.txt +++ b/requirements/requirements_ansible.txt @@ -4,7 +4,8 @@ # # pip-compile --output-file requirements_ansible.txt requirements_ansible.in # -git+https://github.com/chrismeyersfsu/pyrax@tower#egg=pyrax +amqp==1.4.9 # via kombu +anyjson==0.3.3 # via kombu apache-libcloud==1.3.0 appdirs==1.4.0 # via os-client-config, python-ironicclient azure-batch==1.0.0 # via azure @@ -32,7 +33,7 @@ cffi==1.9.1 # via cryptography chardet==2.3.0 # via msrest cliff==2.3.0 # via osc-lib, python-designateclient, python-heatclient, python-mistralclient, python-neutronclient, python-openstackclient cmd2==0.6.9 # via cliff -cryptography==1.5.3 # via azure-storage, python-magnumclient, secretstorage +cryptography==1.6 # via azure-storage, python-magnumclient, secretstorage debtcollector==1.9.0 # via oslo.config, oslo.utils, python-designateclient, python-keystoneclient, python-neutronclient decorator==4.0.10 # via python-magnumclient, shade dogpile.cache==0.6.2 # via python-ironicclient, shade @@ -51,6 +52,7 @@ jsonpointer==1.10 # via jsonpatch jsonschema==2.5.1 # via python-designateclient, python-ironicclient, warlock keyring==10.0.2 # via msrest keystoneauth1==2.15.0 # via openstacksdk, os-client-config, osc-lib, python-cinderclient, python-designateclient, python-heatclient, python-ironicclient, python-keystoneclient, python-magnumclient, python-neutronclient, python-novaclient, python-openstackclient, python-troveclient, shade +kombu==3.0.35 mock==2.0.0 monotonic==1.2 # via oslo.utils msgpack-python==0.4.8 # via oslo.serialization @@ -59,7 +61,7 @@ msrestazure==0.4.4 # via azure-common munch==2.0.4 # via shade netaddr==0.7.18 # via oslo.config, oslo.utils, python-neutronclient netifaces==0.10.5 # via oslo.utils, shade -oauthlib==2.0.0 # via requests-oauthlib +oauthlib==2.0.1 # via requests-oauthlib openstacksdk==0.9.10 # via python-openstackclient os-client-config==1.24.0 # via openstacksdk, osc-lib, python-magnumclient, python-neutronclient, shade os-diskconfig-python-novaclient-ext==0.1.3 # via rackspace-novaclient @@ -81,9 +83,9 @@ python-cinderclient==1.9.0 # via python-openstackclient, shade python-dateutil==2.6.0 # via azure-storage python-designateclient==2.3.0 # via shade python-glanceclient==2.5.0 # via python-openstackclient, shade -python-heatclient==1.6.0 # via shade +python-heatclient==1.6.1 # via shade python-ironicclient==1.8.0 # via shade -python-keystoneclient==3.6.0 # via python-glanceclient, python-mistralclient, python-openstackclient, shade +python-keystoneclient==3.7.0 # via python-glanceclient, python-mistralclient, python-openstackclient, shade python-magnumclient==2.3.1 # via shade python-mistralclient==2.1.1 # via python-troveclient python-neutronclient==6.0.0 # via shade