Properly install from zipball.
Change-Id: I505a42ec11b388e3ee5c818a1aadf0f70d5565c5
This commit is contained in:
parent
405d2494e3
commit
32ba1385ef
|
@ -66,6 +66,9 @@ def parse_requirements(requirements_files=['requirements.txt',
|
|||
line))
|
||||
elif re.match(r'\s*-f\s+', line):
|
||||
pass
|
||||
elif re.match(r'\s*https?:', line):
|
||||
requirements.append(re.sub(r'\s*https?:.*#egg=(.*)$', r'\1',
|
||||
line))
|
||||
else:
|
||||
requirements.append(line)
|
||||
|
||||
|
@ -80,6 +83,8 @@ def parse_dependency_links(requirements_files=['requirements.txt',
|
|||
continue
|
||||
if re.match(r'\s*-[ef]\s+', line):
|
||||
dependency_links.append(re.sub(r'\s*-[ef]\s+', '', line))
|
||||
elif re.match(r'\s*https?:', line):
|
||||
dependency_links.append(line)
|
||||
return dependency_links
|
||||
|
||||
|
||||
|
|
2
setup.py
2
setup.py
|
@ -10,6 +10,7 @@ from glanceclient.openstack.common.setup import write_git_changelog
|
|||
|
||||
requires = parse_requirements()
|
||||
dependency_links = parse_dependency_links()
|
||||
tests_require = parse_requirements(['tools/test-requires'])
|
||||
write_git_changelog()
|
||||
|
||||
if sys.version_info < (2, 6):
|
||||
|
@ -40,6 +41,7 @@ setuptools.setup(
|
|||
],
|
||||
install_requires=requires,
|
||||
dependency_links=dependency_links,
|
||||
tests_require=tests_require,
|
||||
test_suite="nose.collector",
|
||||
entry_points={'console_scripts': ['glance = glanceclient.shell:main']},
|
||||
)
|
||||
|
|
|
@ -2,4 +2,4 @@ argparse
|
|||
httplib2
|
||||
prettytable
|
||||
|
||||
-f https://github.com/openstack/python-keystoneclient/zipball/master#egg=python-keystoneclient
|
||||
https://github.com/openstack/python-keystoneclient/zipball/master#egg=python-keystoneclient
|
||||
|
|
Loading…
Reference in New Issue