From afbbec6ee574105053304d589e89ab2ff2f8a78a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 9 Jul 2015 23:56:52 -0400 Subject: [PATCH 1/2] Fix up vendored package README Fix a couple of typos to properly reflect package name and path. Add vendored deps added when adding VMware & GCE support. Add vendored deps added when vendoring pywinrm. --- awx/lib/site-packages/README | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/awx/lib/site-packages/README b/awx/lib/site-packages/README index 6ba2ff9bde..6fd090b919 100644 --- a/awx/lib/site-packages/README +++ b/awx/lib/site-packages/README @@ -25,16 +25,18 @@ django_polymorphic==0.5.3 (polymorphic/*) django-split-settings==0.1.1 (split_settings/*) django-taggit==0.11.2 (taggit/*) djangorestframework==2.3.13 (rest_framework/*) -django-qsstats-magic==0.7.2 (django-qsstats-magic/*, minor fix in qsstats/__init__.py) +django-qsstats-magic==0.7.2 (qsstats/*, minor fix in qsstats/__init__.py) dogpile.cache==0.5.6 (dogpile/* into our dogpile/ along with dogpile.core) dogpile.core==0.4.1 (dogpile/* into our dogpile/ along with dogpile.cache) gevent-socketio==0.3.6 (socketio/*) gevent-websocket==0.9.3 (geventwebsocket/*) httplib2==0.9 (httplib2/*) importlib==1.0.3 (importlib/*, needed for Python 2.6 support) +isodate==0.5.0 (isodate/*) iso8601==0.1.10 (iso8601/*) +libcloud==0.15.1 (libcloud/*) keyring==4.1 (keyring/*, excluded bin/keyring) -keystoneclient==1.3.0 (keystone/*) +keystoneclient==1.3.0 (keystoneclient/*) kombu==3.0.21 (kombu/*) Markdown==2.4.1 (markdown/*, excluded bin/markdown_py) mock==1.0.1 (mock.py) @@ -55,6 +57,7 @@ pexpect==3.1 (pexpect/*, excluded pxssh.py, fdpexpect.py, FSM.py, screen.py, ANSI.py) pip==1.5.4 (pip/*, excluded bin/pip*) prettytable==0.7.2 (prettytable.py) +psphere==0.5.2 (psphere/*) pyrax==1.9.3 (pyrax/*) python-cinderclient==1.1.1 (cinderclient/*) python-dateutil==2.4.0 (dateutil/*) @@ -65,15 +68,19 @@ python-novaclient==2.20.0 (novaclient/*, excluded bin/nova) python-swiftclient==2.2.0 (swiftclient/*, excluded bin/swift) python-troveclient==1.0.9 (troveclient/*) pytz==2014.10 (pytz/*) +pywinrm==master (winrm/*) rackspace-auth-openstack==1.3 (rackspace_auth_openstack/*) rackspace-novaclient==1.4 (no files) rax_default_network_flags_python_novaclient_ext==0.2.3 (rax_default_network_flags_python_novaclient_ext/*) rax_scheduled_images_python_novaclient_ext==0.2.1 (rax_scheduled_images_python_novaclient_ext/*) +redis==2.10.3 (redis/*) requests==2.5.1 (requests/*) shade==0.5.0 (shade/*, made python2.6 safe by removing dictionary comprehension and adding NullHandler shade/__init__.py) setuptools==12.0.5 (setuptools/*, _markerlib/*, pkg_resources/*, easy_install.py) simplejson==3.6.0 (simplejson/*, excluded simplejson/_speedups.so) six==1.9.0 (six.py) South==0.8.4 (south/*) -stevedor==1.3.0 (stevedor/*) +suds==0.4 (suds/*) +stevedore==1.3.0 (stevedore/*) +xmltodict==0.9.0 (xmltodict.py) IPy==0.83 (IPy.py) From 1d951fa9ccde2325320b93d94ae7ad50b3b83ac5 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 10 Jul 2015 01:25:26 -0400 Subject: [PATCH 2/2] Further normalization of names. --- awx/lib/site-packages/README | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/awx/lib/site-packages/README b/awx/lib/site-packages/README index 6fd090b919..d72e81e327 100644 --- a/awx/lib/site-packages/README +++ b/awx/lib/site-packages/README @@ -4,6 +4,7 @@ versions are listed below, along with notes on which files are included. amqp==1.4.5 (amqp/*) ansiconv==1.0.0 (ansiconv.py) anyjson==0.3.3 (anyjson/*) +apache-libcloud==0.15.1 (libcloud/*) argparse==1.2.1 (argparse.py, needed for Python 2.6 support) azure==0.9.0 (azure/*) Babel==1.3 (babel/*, excluded bin/pybabel) @@ -25,6 +26,7 @@ django_polymorphic==0.5.3 (polymorphic/*) django-split-settings==0.1.1 (split_settings/*) django-taggit==0.11.2 (taggit/*) djangorestframework==2.3.13 (rest_framework/*) +django-rest-framework-mongoengine==1.5.4 (rest_framework_mongoengine/*) django-qsstats-magic==0.7.2 (qsstats/*, minor fix in qsstats/__init__.py) dogpile.cache==0.5.6 (dogpile/* into our dogpile/ along with dogpile.core) dogpile.core==0.4.1 (dogpile/* into our dogpile/ along with dogpile.cache) @@ -34,16 +36,13 @@ httplib2==0.9 (httplib2/*) importlib==1.0.3 (importlib/*, needed for Python 2.6 support) isodate==0.5.0 (isodate/*) iso8601==0.1.10 (iso8601/*) -libcloud==0.15.1 (libcloud/*) keyring==4.1 (keyring/*, excluded bin/keyring) -keystoneclient==1.3.0 (keystoneclient/*) kombu==3.0.21 (kombu/*) Markdown==2.4.1 (markdown/*, excluded bin/markdown_py) mock==1.0.1 (mock.py) mongoengine==0.9.0 (mongoengine/*) -mongoengine_rest_framework==1.5.4 (rest_framework_mongoengine/*) netaddr==0.7.14 (netaddr/*) -os_client_config==0.6.0 (os_client_config/*) +os-client-config==0.6.0 (os_client_config/*) ordereddict==1.1 (ordereddict.py, needed for Python 2.6 support) os_diskconfig_python_novaclient_ext==0.1.2 (os_diskconfig_python_novaclient_ext/*) os_networksv2_python_novaclient_ext==0.25 (os_networksv2_python_novaclient_ext.py) @@ -56,19 +55,20 @@ pbr==0.10.0 (pbr/*) pexpect==3.1 (pexpect/*, excluded pxssh.py, fdpexpect.py, FSM.py, screen.py, ANSI.py) pip==1.5.4 (pip/*, excluded bin/pip*) -prettytable==0.7.2 (prettytable.py) +PrettyTable==0.7.2 (prettytable.py) psphere==0.5.2 (psphere/*) pyrax==1.9.3 (pyrax/*) python-cinderclient==1.1.1 (cinderclient/*) python-dateutil==2.4.0 (dateutil/*) python-glanceclient==0.17.0 (glanceclient/*) python-ironicclient==0.5.0 (ironicclient/*) +python-keystoneclient==1.3.0 (keystoneclient/*) python-neutronclient==2.3.11 (neutronclient/*) python-novaclient==2.20.0 (novaclient/*, excluded bin/nova) python-swiftclient==2.2.0 (swiftclient/*, excluded bin/swift) python-troveclient==1.0.9 (troveclient/*) pytz==2014.10 (pytz/*) -pywinrm==master (winrm/*) +pywinrm==0.0.3 (winrm/*) rackspace-auth-openstack==1.3 (rackspace_auth_openstack/*) rackspace-novaclient==1.4 (no files) rax_default_network_flags_python_novaclient_ext==0.2.3 (rax_default_network_flags_python_novaclient_ext/*)