diff options
author | Doug Hellmann <doug.hellmann@dreamhost.com> | 2013-09-09 09:38:17 -0400 |
---|---|---|
committer | Doug Hellmann <doug.hellmann@dreamhost.com> | 2013-09-23 15:45:23 -0400 |
commit | 6a35ba1b0d7b40eaa184769400ab7445427925dc (patch) | |
tree | 5868ff8e2a337995585b539fefff409bbec45b46 /setup.py | |
parent | ff3ac6435ba27a29cdc015d0d7df45c245a7a5e2 (diff) | |
download | cliff-6a35ba1b0d7b40eaa184769400ab7445427925dc.tar.gz |
Update pyparsing dependency to 2.0.1
Go ahead and require the version of pyparsing that supports
python 2 and 3.
Change-Id: Icdeb7c4a4aeaab9fcc4a44b091a068f91553adf6
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 14 |
1 files changed, 2 insertions, 12 deletions
@@ -17,20 +17,10 @@ except IOError: install_requires = [ 'PrettyTable>=0.6,<0.8', - # Restrict cliff from bringing in cmd2 0.6.6 until the problem - # with the Python 3-only code is resolved. - 'cmd2>=0.6.4,<0.6.6', + 'pyparsing>=2.0.1', + 'cmd2>=0.6.7', ] -# We need a different version of PyParsing, depending on which version -# of Python we're using. cmd2 should have this set properly, but until -# there is a release declare the dependency ourselves. -# http://trac-hg.assembla.com/python-cmd2/rev/a5f3d5a89d6c -if sys.version_info[0] < 3: - install_requires.append('pyparsing==1.5.7') -else: - install_requires.append('pyparsing>=2.0.0') - try: import argparse # noqa except ImportError: |