projects
/
kamaki
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'features/rfctr-argument' into develop
[kamaki]
/
setup.py
diff --git
a/setup.py
b/setup.py
index
ac58090
..
cb89d9d
100755
(executable)
--- a/
setup.py
+++ b/
setup.py
@@
-39,10
+39,11
@@
from sys import version_info
import kamaki
import kamaki
-required = ['ansicolors==1.0.2', 'progress==1.0.1', 'requests==0.12.1', 'gevent==0.13.6']
-
-if version_info[0:2] < (2, 7):
- required.extend(['argparse', 'ordereddict'])
+optional = ['ansicolors',
+ 'progress>=1.0.2']
+requires = ['objpool',
+ 'ordereddict',
+ 'argparse']
setup(
name='kamaki',
setup(
name='kamaki',
@@
-51,10
+52,10
@@
setup(
long_description=open('README.rst').read(),
url='http://code.grnet.gr/projects/kamaki',
license='BSD',
long_description=open('README.rst').read(),
url='http://code.grnet.gr/projects/kamaki',
license='BSD',
- packages=['kamaki', 'kamaki.cli', 'kamaki.clients', 'kamaki.clients.connection', 'kamaki.cli.commands'],
+ packages=['kamaki', 'kamaki.clients', 'kamaki.clients.connection', 'kamaki.cli', 'kamaki.cli.commands'],
include_package_data=True,
entry_points={
'console_scripts': ['kamaki = kamaki.cli:main']
},
include_package_data=True,
entry_points={
'console_scripts': ['kamaki = kamaki.cli:main']
},
- install_requires=required
+ install_requires=requires
)
)