diff options
author | Doug Hellmann <doug.hellmann@gmail.com> | 2012-05-14 07:44:43 -0700 |
---|---|---|
committer | Doug Hellmann <doug.hellmann@gmail.com> | 2012-05-14 07:44:43 -0700 |
commit | 8dff166aa9ef41fb37217ad7e7aad78532d4c7bb (patch) | |
tree | e9b81492e166b8b3b300549994993bd3f7fa3b89 | |
parent | 31ac9831956e030bb4f815c20583482ed8cae852 (diff) | |
parent | 2ffa8496131fec1638b903fb9738be4eac597288 (diff) | |
download | cliff-tablib-8dff166aa9ef41fb37217ad7e7aad78532d4c7bb.tar.gz |
Merge pull request #9 from heavenshell/feature_py26
Enable to run in Python2.6
-rw-r--r-- | cliff/app.py | 2 | ||||
-rw-r--r-- | setup.py | 19 | ||||
-rw-r--r-- | tox.ini | 2 |
3 files changed, 15 insertions, 8 deletions
diff --git a/cliff/app.py b/cliff/app.py index 55420b5..2b60d34 100644 --- a/cliff/app.py +++ b/cliff/app.py @@ -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', @@ -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(), @@ -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 [] |