Merge pull request #153 from baztian/fix-python2-install-requirements
Make pip install for Python 2 work againmaster
commit
34ab8a0265
|
|
@ -160,6 +160,11 @@ Changelog
|
||||||
=========
|
=========
|
||||||
|
|
||||||
- Next version - unreleased
|
- 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
|
- 1.2.2 - 2020-06-04
|
||||||
|
|
||||||
- Return (big) decimal types as long value if scale is zero (thanks
|
- Return (big) decimal types as long value if scale is zero (thanks
|
||||||
|
|
|
||||||
6
setup.py
6
setup.py
|
|
@ -20,9 +20,9 @@ import sys
|
||||||
|
|
||||||
from setuptools import setup
|
from setuptools import setup
|
||||||
|
|
||||||
install_requires = []
|
install_requires = [ 'JPype1 ; python_version > "2.7" and platform_python_implementation != "Jython"',
|
||||||
if not sys.platform.lower().startswith('java'):
|
'JPype1<=0.7.1 ; python_version <= "2.7" and platform_python_implementation != "Jython"',
|
||||||
install_requires.append('JPype1')
|
]
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
#basic package data
|
#basic package data
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue