Updated depend processing to norms.
Change-Id: I843c30acaf813614def68b936eb5a982e5a9b242
This commit is contained in:
parent
7103638782
commit
cc479717cf
14
setup.py
14
setup.py
|
@ -2,15 +2,13 @@ import os
|
||||||
|
|
||||||
import setuptools
|
import setuptools
|
||||||
|
|
||||||
#from glanceclient.openstack.common.setup import parse_requirements
|
from glanceclient.openstack.common.setup import parse_requirements
|
||||||
#from glanceclient.openstack.common.setup import parse_dependency_links
|
from glanceclient.openstack.common.setup import parse_dependency_links
|
||||||
#from glanceclient.openstack.common.setup import write_requirements
|
|
||||||
from glanceclient.openstack.common.setup import write_git_changelog
|
from glanceclient.openstack.common.setup import write_git_changelog
|
||||||
|
|
||||||
|
|
||||||
#requires = parse_requirements()
|
requires = parse_requirements()
|
||||||
#dependency_links = parse_dependency_links()
|
dependency_links = parse_dependency_links()
|
||||||
#write_requirements()
|
|
||||||
write_git_changelog()
|
write_git_changelog()
|
||||||
|
|
||||||
|
|
||||||
|
@ -36,8 +34,8 @@ setuptools.setup(
|
||||||
'Operating System :: OS Independent',
|
'Operating System :: OS Independent',
|
||||||
'Programming Language :: Python',
|
'Programming Language :: Python',
|
||||||
],
|
],
|
||||||
# install_requires=requires,
|
install_requires=requires,
|
||||||
# dependency_links=dependency_links,
|
dependency_links=dependency_links,
|
||||||
test_suite="nose.collector",
|
test_suite="nose.collector",
|
||||||
entry_points={'console_scripts': ['glance = glanceclient.shell:main']},
|
entry_points={'console_scripts': ['glance = glanceclient.shell:main']},
|
||||||
)
|
)
|
||||||
|
|
4
tox.ini
4
tox.ini
|
@ -28,10 +28,6 @@ deps = file://{toxinidir}/.cache.bundle
|
||||||
basepython = python2.7
|
basepython = python2.7
|
||||||
deps = file://{toxinidir}/.cache.bundle
|
deps = file://{toxinidir}/.cache.bundle
|
||||||
|
|
||||||
[testenv:jenkinspep8]
|
|
||||||
deps = file://{toxinidir}/.cache.bundle
|
|
||||||
commands = pep8 --repeat --show-source glanceclient setup.py
|
|
||||||
|
|
||||||
[testenv:jenkinscover]
|
[testenv:jenkinscover]
|
||||||
deps = file://{toxinidir}/.cache.bundle
|
deps = file://{toxinidir}/.cache.bundle
|
||||||
commands = nosetests --cover-erase --cover-package=glanceclient --with-xcoverage
|
commands = nosetests --cover-erase --cover-package=glanceclient --with-xcoverage
|
||||||
|
|
Loading…
Reference in New Issue