Skip to content

Commit

Permalink
Merge "Use install_requires in setup.py"
Browse files Browse the repository at this point in the history
  • Loading branch information
Jenkins authored and openstack-gerrit committed Dec 18, 2012
2 parents c840bd4 + dcff5ff commit 9543a71
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
6 changes: 5 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
name = 'swift'


with open('tools/pip-requires', 'r') as f:
requires = [x.strip() for x in f if x.strip()]


setup(
name=name,
version=version,
Expand All @@ -40,7 +44,7 @@
'Environment :: No Input/Output (Daemon)',
'Environment :: OpenStack',
],
install_requires=[], # removed for better compat
install_requires=requires,
scripts=[
'bin/swift-account-audit',
'bin/swift-account-auditor',
Expand Down
12 changes: 6 additions & 6 deletions tools/pip-requires
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
eventlet==0.9.15
greenlet==0.3.1
netifaces==0.6
pastedeploy==1.3.3
simplejson==2.0.9
xattr==0.4
eventlet>=0.9.15
greenlet>=0.3.1
netifaces>=0.6
pastedeploy>=1.3.3
simplejson>=2.0.9
xattr>=0.4
python-swiftclient

0 comments on commit 9543a71

Please sign in to comment.