From edaf018f2c336de6cc7b3a83b504e5e400bbed74 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Wed, 16 Nov 2016 13:39:44 -0500 Subject: [PATCH] Revert "factored out base requirements" This reverts commit c5129a054c272a5e59008b3dc4d8a2f287f310a6. --- requirements/requirements.txt | 200 +++++++++++++--------------------- requirements/tower/base.txt | 48 -------- 2 files changed, 78 insertions(+), 170 deletions(-) delete mode 100644 requirements/tower/base.txt diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 975374aaed..1ee9a35ede 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,180 +1,136 @@ -amqp==1.4.9 git+https://github.com/ansible/ansiconv.git@tower_1.0.0#egg=ansiconv +amqp==1.4.9 anyjson==0.3.3 -apache-libcloud==0.20.1 appdirs==1.4.0 asgi-amqp==0.3.1 -asgiref==1.0.0 -autobahn==0.16.1 azure==2.0.0rc5 -azure-batch==0.30.0rc5 -azure-common==1.1.4 -azure-graphrbac==0.30.0rc5 -azure-mgmt==0.30.0rc5 -azure-mgmt-authorization==0.30.0rc5 -azure-mgmt-batch==0.30.0rc5 -azure-mgmt-cdn==0.30.0rc5 -azure-mgmt-cognitiveservices==0.30.0rc5 -azure-mgmt-commerce==0.30.0rc5 -azure-mgmt-compute==0.30.0rc5 -azure-mgmt-keyvault==0.30.0rc5 -azure-mgmt-logic==0.30.0rc5 -azure-mgmt-network==0.30.0rc5 -azure-mgmt-notificationhubs==0.30.0rc5 -azure-mgmt-nspkg==1.0.0 -azure-mgmt-powerbiembedded==0.30.0rc5 -azure-mgmt-redis==0.30.0rc5 -azure-mgmt-resource==0.30.0rc5 -azure-mgmt-scheduler==0.30.0rc5 -azure-mgmt-storage==0.30.0rc5 -azure-mgmt-web==0.30.0rc5 -azure-nspkg==1.0.0 -azure-servicebus==0.20.2 -azure-servicemanagement-legacy==0.20.3 -azure-storage==0.32.0 -backports.functools-lru-cache==1.3 +Babel==2.2.0 baron==0.6.2 -billiard==3.5.0.2 +billiard==3.3.0.23 boto==2.43.0 -celery==4.0.0 -cffi==1.9.1 +celery==3.1.23 +cffi==1.7.0 channels==0.17.3 -cliff==2.3.0 -cmd2==0.6.9 -constantly==15.1.0 -cryptography==1.5.3 -d2to1==0.2.11 +cliff==1.15.0 +cmd2==0.6.8 daphne==0.15.0 -debtcollector==1.9.0 -decorator==4.0.10 +d2to1==0.2.11 defusedxml==0.4.1 -Django==1.10.3 +Django==1.8.16 +debtcollector==1.2.0 +decorator==4.0.6 django-auth-ldap==1.2.6 django-celery==3.1.17 django-crum==0.6.1 django-extensions==1.5.9 django-jsonfield==1.0.1 +git+https://github.com/ansible/django-jsonbfield@fix-sqlite_serialization#egg=jsonbfield django-polymorphic==0.7.2 -git+https://github.com/ansible/django-qsstats-magic.git@tower_0.7.2#egg=django-qsstats-magic django-radius==1.0.0 -django-solo==1.1.2 -django-split-settings==0.1.1 -django-taggit==0.17.6 -django-transaction-hooks==0.2 djangorestframework==3.3.2 djangorestframework-yaml==1.0.2 +django-solo==1.1.2 +django-split-settings==0.1.1 +django-transaction-hooks==0.2 +django-taggit==0.17.6 git+https://github.com/ansible/dm.xmlsec.binding.git@master#egg=dm.xmlsec.binding -dogpile.cache==0.6.2 -enum34==1.1.6 -funcsigs==1.0.2 -functools32==3.2.3.post2 -futures==3.0.5 -gevent==1.1.2 +dogpile.core==0.4.1 +funcsigs==0.4 +gevent==1.1.0 gevent-websocket==0.9.5 -greenlet==0.4.10 -idna==2.1 +git+https://github.com/ansible/django-qsstats-magic.git@tower_0.7.2#egg=django-qsstats-magic +greenlet==0.4.9 +dogpile.cache==0.5.7 +enum34==1.1.2 +futures==3.0.4 +httplib2==0.9.2 +idna==2.0 importlib==1.0.3 -incremental==16.10.1 -inflect==0.2.5 -ip-associations-python-novaclient-ext==0.2 -ipaddress==1.0.17 +ip-associations-python-novaclient-ext==0.1 +ipaddress==1.0.16 irc==13.3.1 iso8601==0.1.11 -isodate==0.5.0 -jaraco.classes==1.4 -jaraco.collections==1.5 -jaraco.functools==1.15.1 -jaraco.itertools==2.0 -jaraco.logging==1.5 -jaraco.text==1.8 -git+https://github.com/ansible/django-jsonbfield@fix-sqlite_serialization#egg=jsonbfield -jsonpatch==1.14 -jsonpickle==0.9.3 +isodate==0.5.1 +jsonpatch==1.12 jsonpointer==1.10 jsonschema==2.5.1 -keyring==10.0.2 -keystoneauth1==2.15.0 +keyring==4.1 kombu==3.0.35 -lxml==3.6.4 -M2Crypto==0.22.3 +apache-libcloud==0.20.1 +lxml==3.4.4 Markdown==2.4.1 -mock==2.0.0 -monotonic==1.2 -more-itertools==2.3 +M2Crypto==0.22.3 +mock==1.0.1 +monotonic==0.6 msgpack-python==0.4.7 munch==2.0.4 netaddr==0.7.18 -netifaces==0.10.5 -oauthlib==2.0.0 -openstacksdk==0.9.10 +netifaces==0.10.4 +oauthlib==1.0.3 ordereddict==1.1 -os-client-config==1.24.0 +os-client-config==1.14.0 os-diskconfig-python-novaclient-ext==0.1.3 -os-networksv2-python-novaclient-ext==0.26 -os-virtual-interfacesv2-python-novaclient-ext==0.20 -osc-lib==1.2.0 -oslo.config==3.19.0 -oslo.i18n==3.10.0 -oslo.serialization==2.14.0 -oslo.utils==3.18.0 -pbr==1.10.0 +os-networksv2-python-novaclient-ext==0.25 +os-virtual-interfacesv2-python-novaclient-ext==0.19 +pbr==1.8.1 +oslo.config==3.3.0 +oslo.i18n==3.2.0 +oslo.serialization==2.2.0 +oslo.utils==3.4.0 pexpect==3.1 -pipdeptree==0.8.0 -positional==1.1.1 prettytable==0.7.2 psphere==0.5.2 psutil==3.1.1 +psycopg2==2.6.1 pyasn1==0.1.9 -pycparser==2.17 +pycrypto==2.6.1 +pycparser==2.14 pygerduty==0.32.1 -PyJWT==1.4.2 +PyJWT==1.4.0 pyOpenSSL==16.0.0 -pyparsing==2.1.10 +pyparsing==2.0.7 pyrad==2.0 pyrax==1.9.7 -python-cinderclient==1.9.0 -python-dateutil==2.6.0 -python-glanceclient==2.5.0 -python-heatclient==1.5.0 -python-ironicclient==1.8.0 -python-keystoneclient==3.6.0 -python-ldap==2.4.27 +python-cinderclient==1.5.0 +python-dateutil==2.4.0 +python-glanceclient==1.1.0 +python-heatclient==0.8.1 +python-ironicclient==1.0.0 +python-keystoneclient==2.1.1 +python-ldap==2.4.20 python-memcached==1.58 -python-mistralclient==2.1.1 -python-neutronclient==6.0.0 -python-novaclient==2.27.0 +python-neutronclient==4.0.0 +python-novaclient==3.2.0 python-openid==2.2.5 -python-openstackclient==3.3.0 +python-openstackclient==2.0.0 python-radius==1.0 python-saml==2.1.8 python-social-auth==0.2.21 -python-swiftclient==3.2.0 -python-troveclient==2.5.0 +python-swiftclient==2.7.0 +python-troveclient==1.4.0 +pytz==2015.7 +PyYAML==3.11 pyzmq==14.5.0 rackspace-auth-openstack==1.3 -rackspace-novaclient==2.1 -rax-default-network-flags-python-novaclient-ext==0.4.0 +rackspace-novaclient==1.5 +rax-default-network-flags-python-novaclient-ext==0.3.2 rax-scheduled-images-python-novaclient-ext==0.3.1 redbaron==0.6.1 -requests==2.12.1 -requests-oauthlib==0.7.0 -requestsexceptions==1.1.3 -rfc3986==0.4.1 +requests-oauthlib==0.5.0 +requests==2.11.0 +requestsexceptions==1.1.1 rply==0.7.4 -SecretStorage==2.3.1 shade==1.4.0 -simplejson==3.10.0 +simplejson==3.8.1 +six==1.9.0 slackclient==0.16 -stevedore==1.18.0 +stevedore==1.10.0 suds==0.4 -tempora==1.6.1 -twilio==4.9.1 -Twisted==16.5.0 -txaio==2.5.2 unicodecsv==0.14.1 -uWSGI==2.0.14 warlock==1.2.0 -websocket-client==0.37.0 -wrapt==1.10.8 +twilio==4.9.1 +uWSGI==2.0.14 +wheel==0.24.0 +wrapt==1.10.6 +wsgiref==0.1.2 xmltodict==0.9.2 -zope.interface==4.3.2 diff --git a/requirements/tower/base.txt b/requirements/tower/base.txt deleted file mode 100644 index 6c5ec2cc61..0000000000 --- a/requirements/tower/base.txt +++ /dev/null @@ -1,48 +0,0 @@ -ansiconv==1.0.0 -apache-libcloud==0.20.1 -asgi-amqp==0.3.1 -azure==2.0.0rc5 -boto==2.43.0 -channels==0.17.3 -d2to1==0.2.11 -django-auth-ldap==1.2.6 -django-celery==3.1.17 -django-crum==0.6.1 -django-extensions==1.5.9 -django-jsonfield==1.0.1 -django-polymorphic==0.7.2 -django-qsstats-magic==0.7.2 -django-radius==1.0.0 -django-solo==1.1.2 -django-split-settings==0.1.1 -django-taggit==0.17.6 -django-transaction-hooks==0.2 -djangorestframework==3.3.2 -djangorestframework-yaml==1.0.2 -gevent-websocket==0.9.5 -importlib==1.0.3 -irc==13.3.1 -jsonbfield==0.1.0 -M2Crypto==0.22.3 -Markdown==2.4.1 -ordereddict==1.1 -pexpect==3.1 -pipdeptree==0.8.0 -psphere==0.5.2 -psutil==3.1.1 -pycrypto==2.6.1 -pygerduty==0.32.1 -pyOpenSSL==16.0.0 -pyrax==1.9.7 -python-memcached==1.58 -python-radius==1.0 -python-saml==2.1.8 -python-social-auth==0.2.21 -pyzmq==14.5.0 -redbaron==0.6.1 -shade==1.4.0 -slackclient==0.16 -twilio==4.9.1 -uWSGI==2.0.14 -wheel==0.30.0a0 -xmltodict==0.9.2