Permalink
Browse files

Merge "Updated depend processing to norms."

  • Loading branch information...
2 parents c80e264 + cc47971 commit 73ea207a390f8026b371e1037caec8cbc5d912ef Jenkins committed with openstack-gerrit Apr 9, 2012
Showing with 6 additions and 12 deletions.
  1. +6 −8 setup.py
  2. +0 −4 tox.ini
View
@@ -2,15 +2,13 @@
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 @@ def read(fname):
'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']},
)
View
@@ -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

0 comments on commit 73ea207

Please sign in to comment.