Moving argparse require out of pip-requires
argparse is included in 2.7+. We should only be installing it if we are running Python 2.6. Side note, the argparse version in pip needs to be repackaged to conform to pip 1.5+ standards. Otherwise, we need to also look into adding workarounds for that as well. :: edit :: Changed my mind on where I wanted to put this. Change-Id: Idfa8ca93b105aebbc3aecbddcca7caee97192912
This commit is contained in:
parent
382e6f12b1
commit
a6aa39cbfe
|
@ -1,6 +1,5 @@
|
|||
decorator
|
||||
paramiko
|
||||
argparse==1.2.1
|
||||
unittest2==0.5.1
|
||||
pyes==0.20.0
|
||||
thrift==0.9.1
|
||||
|
|
10
setup.py
10
setup.py
|
@ -57,6 +57,13 @@ def _post_install(dir):
|
|||
-----------------------------------------------------------------
|
||||
""")
|
||||
|
||||
# Reading Requires
|
||||
requires = open('pip-requires').readlines()
|
||||
|
||||
# Add additional requires for Python 2.6 support
|
||||
if sys.version_info < (2, 7):
|
||||
requires.append('argparse==1.2.1')
|
||||
|
||||
|
||||
#cmdclass hook allows setup to make post install call
|
||||
class install(_install):
|
||||
|
@ -66,10 +73,7 @@ class install(_install):
|
|||
_post_install, (self.install_lib,),
|
||||
msg="\nRunning post install tasks...")
|
||||
|
||||
|
||||
#Normal setup stuff
|
||||
requires = open('pip-requires').readlines()
|
||||
|
||||
setup(
|
||||
name='cafe',
|
||||
version='0.1.0',
|
||||
|
|
Loading…
Reference in New Issue