openstack
/
deb-python-pulp
Code Issues Proposed changes

Merge pull request #107 from dims/fix-pyparsing-version 

Remove pyparsing version check from setup.py
This commit is contained in:
Stuart Mitchell 2016-06-08 08:15:39 +09:00
parent eb374541f6 01f1f98df1
commit 8d63ae1ac5
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
setup.py
View File

@ -17,12 +17,6 @@ version_dict = {}
exec(open('src/pulp/constants.py').read(), version_dict)
VERSION = version_dict['VERSION']
#hack because pyparsing made version 2 python 3 specific
if sys.version_info[0] <= 2:
pyparsing_ver = 'pyparsing<=1.9.9'
else:
pyparsing_ver = 'pyparsing>=2.0.0'
setup(name="PuLP",
version=VERSION,
description="""
@ -68,7 +62,7 @@ problems.
'pulp.solverdir.cbc.win.64' : ['*','*.*'],
'pulp.solverdir.cbc.osx.64' : ['*','*.*'],
},
install_requires = [pyparsing_ver],
install_requires = ['pyparsing>=2.0.1'],
entry_points = ("""
[console_scripts]
pulptest = pulp:pulpTestAll