Skip to content

Commit b63a664

Browse files
committed
Revert to JPype 1.3.0+
This mostly reverts commit 61bc020. Unfortunately, there is a holdup getting JPype 1.4.0 onto conda-forge. So we cannot depend on 1.4.0 yet. See jpype-project/jpype1#1072.
1 parent 61bc020 commit b63a664

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

environment-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ channels:
77
dependencies:
88
- pytest
99
- pytest-cov
10-
- jpype1 >= 1.4.0
10+
- jpype1 >= 1.3.0
1111
- jgo
1212
- numpy
1313
- pandas

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ channels:
33
- conda-forge
44
- defaults
55
dependencies:
6-
- jpype1 >= 1.4.0
6+
- jpype1 >= 1.3.0
77
- jgo
88
- scyjava

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ package_dir =
3939
# Ensure any changes to this list are also added to environment.yml AND environment-test.yml!
4040
python_requires = >=3.6
4141
install_requires =
42-
jpype1 >= 1.4.0
42+
jpype1 >= 1.3.0
4343
jgo
4444

4545
[options.packages.find]

0 commit comments

Comments
 (0)