From 32ba1385ef907eba02a77ba1c3ea3ef1b60b8da6 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Fri, 25 May 2012 11:30:01 -0400
Subject: [PATCH] Properly install from zipball.

Change-Id: I505a42ec11b388e3ee5c818a1aadf0f70d5565c5
---
 glanceclient/openstack/common/setup.py | 5 +++++
 setup.py                               | 2 ++
 tools/pip-requires                     | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/glanceclient/openstack/common/setup.py b/glanceclient/openstack/common/setup.py
index 50c59db3..7c2835e6 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
 
 
diff --git a/setup.py b/setup.py
index a5f1d1d8..4634ccd9 100644
--- a/setup.py
+++ b/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']},
 )
diff --git a/tools/pip-requires b/tools/pip-requires
index b908f891..6a833228 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