Merge pull request #153 from baztian/fix-python2-install-requirements

Make pip install for Python 2 work again
master
baztian 2020-06-12 08:33:44 +02:00 committed by GitHub
commit 34ab8a0265
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions

View File

@ -160,6 +160,11 @@ Changelog
=========
- Next version - unreleased
- Make pip install for Python 2 work by changing JPype1 requirement to older
version
- Make pip install for Jython work by removing JPype1 requirement for Jython
- 1.2.2 - 2020-06-04
- Return (big) decimal types as long value if scale is zero (thanks

View File

@ -20,9 +20,9 @@ import sys
from setuptools import setup
install_requires = []
if not sys.platform.lower().startswith('java'):
install_requires.append('JPype1')
install_requires = [ 'JPype1 ; python_version > "2.7" and platform_python_implementation != "Jython"',
'JPype1<=0.7.1 ; python_version <= "2.7" and platform_python_implementation != "Jython"',
]
setup(
#basic package data