From 0905c339df9f0a4a203bf50b73434629f3114e95 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Mon, 9 Sep 2013 09:43:29 -0400 Subject: Use the latest version of pyparsing when possible The 2.0.1 release of pyparsing restores Python 2 and 3 compatibility, so use that instead of setting the version based on version of Python under which we are being installed. This facilitates dependencies that want to support both Python 2 and 3. Keep the dependency on 1.5.7 for Python 2.5, which is not supported by pyparsing 2.0.1. --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3670b92f..2bf3815f 100755 --- a/setup.py +++ b/setup.py @@ -7,10 +7,10 @@ except ImportError: return ['sqlpython'] import sys -if sys.version_info < (3, 0, 0): +if sys.version_info[:2] == (2, 5): install_requires = ['pyparsing == 1.5.7'] else: - install_requires = ['pyparsing >= 2.0.0'] + install_requires = ['pyparsing >= 2.0.1'] setup( name="cmd2", -- cgit v1.2.1