diff options
| author | Monty Taylor <mordred@inaugust.com> | 2012-05-25 11:30:01 -0400 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2012-05-25 14:38:33 -0400 |
| commit | 32ba1385ef907eba02a77ba1c3ea3ef1b60b8da6 (patch) | |
| tree | 37bc301711e69a60f3ece2894d9b9967c6e0984e | |
| parent | 405d2494e382d9fcd6735883fcfd9dd13bf943e0 (diff) | |
| download | python-glanceclient-32ba1385ef907eba02a77ba1c3ea3ef1b60b8da6.tar.gz | |
Properly install from zipball.
Change-Id: I505a42ec11b388e3ee5c818a1aadf0f70d5565c5
| -rw-r--r-- | glanceclient/openstack/common/setup.py | 5 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | tools/pip-requires | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/glanceclient/openstack/common/setup.py b/glanceclient/openstack/common/setup.py index 50c59db..7c2835e 100644 --- a/glanceclient/openstack/common/setup.py +++ b/glanceclient/openstack/common/setup.py @@ -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 @@ -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']}, ) diff --git a/tools/pip-requires b/tools/pip-requires index b908f89..6a83322 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -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 |