Merge pull request #9 from heavenshell/feature_py26

Enable to run in Python2.6
This commit is contained in:
Doug Hellmann 2012-05-14 07:44:43 -07:00
commit 8dff166aa9
3 changed files with 15 additions and 8 deletions

View File

@ -70,7 +70,7 @@ class App(object):
parser.add_argument(
'--version',
action='version',
version='%(prog)s {}'.format(version),
version='%(prog)s {0}'.format(version),
)
parser.add_argument(
'-v', '--verbose',

View File

@ -21,6 +21,18 @@ try:
except IOError:
long_description = ''
install_requires = ['distribute',
# disabled until OpenStack catches up 'PrettyTable>=0.6',
'PrettyTable',
'cmd2',
'tablib',
]
try:
import argparse
except ImportError:
install_requires.append('argparse')
##############################################################################
# find_package_data is an Ian Bicking creation.
@ -145,12 +157,7 @@ setup(
provides=['cliff',
],
install_requires=['distribute',
# disabled until OpenStack catches up 'PrettyTable>=0.6',
'PrettyTable',
'cmd2',
'tablib',
],
install_requires=install_requires,
namespace_packages=[],
packages=find_packages(),

View File

@ -1,5 +1,5 @@
[tox]
envlist = py27,py32,pep8
envlist = py26,py27,py32,pep8
[testenv]
commands = nosetests -d --with-coverage --cover-inclusive --cover-package cliff []