Skip to content

Commit 4c28270

Browse files
authored
Merge pull request #81 from tlambert03/update-env
chore: update env.yml files for cjdk
2 parents 1a8a1a7 + ec51083 commit 4c28270

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

dev-environment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#
1313
# In addition to the dependencies needed for using scyjava, it
1414
# includes tools for developer-related actions like running
15-
# automated tests (pytest) and linting the code (black). If you
15+
# automated tests (pytest) and linting the code (ruff). If you
1616
# want an environment without these tools, use environment.yml.
1717
name: scyjava-dev
1818
channels:
@@ -22,6 +22,7 @@ dependencies:
2222
# Project dependencies
2323
- jpype1 >= 1.3.0
2424
- jgo
25+
- cjdk
2526
- openjdk >= 8, < 12
2627
# Test dependencies
2728
- numpy
@@ -37,6 +38,5 @@ dependencies:
3738
# Project from source
3839
- pip
3940
- pip:
40-
- cjdk
4141
- git+https://github.com/ninia/jep.git@cfca63f8b3398daa6d2685428660dc4b2bfab67d
4242
- -e .

environment.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#
1313
# It includes the dependencies needed for using scyjava, but not tools
1414
# for developer-related actions like running automated tests (pytest),
15-
# linting the code (black), and generating the API documentation (sphinx).
15+
# linting the code (ruff), and generating the API documentation (sphinx).
1616
# If you want an environment including these tools, use dev-environment.yml.
1717

1818
name: scyjava
@@ -23,6 +23,7 @@ dependencies:
2323
# Project dependencies
2424
- jpype1 >= 1.3.0
2525
- jgo
26+
- cjdk
2627
- openjdk >= 8
2728
# Project from source
2829
- pip

0 commit comments

Comments
 (0)