Merge "Updated depend processing to norms."

setup.py

@@ -2,15 +2,13 @@ import os
 
 import setuptools
 
-#from glanceclient.openstack.common.setup import parse_requirements
-#from glanceclient.openstack.common.setup import parse_dependency_links
-#from glanceclient.openstack.common.setup import write_requirements
+from glanceclient.openstack.common.setup import parse_requirements
+from glanceclient.openstack.common.setup import parse_dependency_links
 from glanceclient.openstack.common.setup import write_git_changelog
 
 
-#requires = parse_requirements()
-#dependency_links = parse_dependency_links()
-#write_requirements()
+requires = parse_requirements()
+dependency_links = parse_dependency_links()
 write_git_changelog()
 
 
@@ -36,8 +34,8 @@ setuptools.setup(
         'Operating System :: OS Independent',
         'Programming Language :: Python',
     ],
-#    install_requires=requires,
-#    dependency_links=dependency_links,
+    install_requires=requires,
+    dependency_links=dependency_links,
     test_suite="nose.collector",
     entry_points={'console_scripts': ['glance = glanceclient.shell:main']},
 )

tox.ini

@@ -28,10 +28,6 @@ deps = file://{toxinidir}/.cache.bundle
 basepython = python2.7
 deps = file://{toxinidir}/.cache.bundle
 
-[testenv:jenkinspep8]
-deps = file://{toxinidir}/.cache.bundle
-commands = pep8 --repeat --show-source glanceclient setup.py
-
 [testenv:jenkinscover]
 deps = file://{toxinidir}/.cache.bundle
 commands = nosetests --cover-erase --cover-package=glanceclient --with-xcoverage