From e6cadb42e5f4b02382c839b2c6c6761dc0540977 Mon Sep 17 00:00:00 2001 From: baztian Date: Wed, 10 Jun 2020 23:34:40 +0200 Subject: [PATCH 1/2] Make pip install for Jython work by removing JPype1 requirement for Jython --- README.rst | 3 +++ setup.py | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index e1b2bb2..f3fe82b 100644 --- a/README.rst +++ b/README.rst @@ -160,6 +160,9 @@ Changelog ========= - Next version - unreleased + + - 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 diff --git a/setup.py b/setup.py index e867031..6ad2c0b 100644 --- a/setup.py +++ b/setup.py @@ -20,9 +20,7 @@ import sys from setuptools import setup -install_requires = [] -if not sys.platform.lower().startswith('java'): - install_requires.append('JPype1') +install_requires = ['JPype1 ; platform_python_implementation != "Jython"'] setup( #basic package data From 4280a11ea009b3dccd3189f6180e9c68ce12b69b Mon Sep 17 00:00:00 2001 From: baztian Date: Fri, 12 Jun 2020 08:23:51 +0200 Subject: [PATCH 2/2] Make pip install for Python 2 work. Fixes #152 --- README.rst | 2 ++ setup.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index f3fe82b..38147b9 100644 --- a/README.rst +++ b/README.rst @@ -161,6 +161,8 @@ 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 diff --git a/setup.py b/setup.py index 6ad2c0b..5a1e024 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,9 @@ import sys from setuptools import setup -install_requires = ['JPype1 ; platform_python_implementation != "Jython"'] +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