summaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-02-20 06:31:11 +0000
committerGerrit Code Review <review@openstack.org>2012-02-20 06:31:11 +0000
commit6e2b111c2ba75a909d61259c0ac119bd10ee1e1b (patch)
tree5e293b13a2e6b90751e55979e2a29de4874b40f7 /setup.py
parent8f1de0c493a68eec5801037590d769e711f19127 (diff)
parentad934e237d72ccec57910195796b9c9e418c7cfa (diff)
downloadoslo-6e2b111c2ba75a909d61259c0ac119bd10ee1e1b.tar.gz
oslo-6e2b111c2ba75a909d61259c0ac119bd10ee1e1b.tar.xz
oslo-6e2b111c2ba75a909d61259c0ac119bd10ee1e1b.zip
Merge "Use default values for requirements parsing."
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/setup.py b/setup.py
index 0f0bc2b..8d9cd30 100644
--- a/setup.py
+++ b/setup.py
@@ -6,11 +6,8 @@ from openstack.common.setup import write_requirements
version = '0.1'
-requires = parse_requirements(['requirements.txt', 'tools/pip-requires'])
-
-depend_links = parse_dependency_links(['requirements.txt',
- 'tools/pip-requires'])
-
+requires = parse_requirements()
+depend_links = parse_dependency_links()
write_requirements()
setup(name='openstack.common',