Skip to content

Commit d3cf5bd

Browse files
authored
Drop outdated pin of JPype on CI (#880)
* Drop installing old JPype1 version * Bump versions of conda installers * Fix typo in docstring
1 parent b5ad9d2 commit d3cf5bd

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.github/workflows/conda.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@ jobs:
1616
matrix:
1717
os: [windows-latest, macos-latest]
1818
conda:
19-
- {installer: anaconda, version: 2023.03-1}
20-
- {installer: miniconda, version: py310_23.3.1-0}
21-
extra-deps: ["", "JPype1=1.2.1"]
19+
- {installer: anaconda, version: 2024.06-1}
20+
- {installer: miniconda, version: py312_24.7.1-0}
2221
fail-fast: false
2322

2423
runs-on: ${{ matrix.os }}
25-
name: ${{ matrix.os }}-${{ matrix.conda.installer }}-${{ matrix.extra-deps }}
24+
name: ${{ matrix.os }}-${{ matrix.conda.installer }}
2625

2726
steps:
2827
- name: Cache Anaconda installer, conda packages
@@ -70,7 +69,7 @@ jobs:
7069
7170
# Also install pytest and packages required for testing. pip/PyPI
7271
# supports this via message_ix[testing], but conda does not.
73-
conda create --quiet --name testenv message-ix ${{ matrix.extra-deps }} pytest asyncssh sphinx
72+
conda create --quiet --name testenv message-ix pytest asyncssh sphinx
7473
conda list --name testenv
7574
7675
- name: Check CLI commands and run test

message_ix/model/MESSAGE/model_core.gms

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ CAPACITY_CONSTRAINT(node,inv_tec,vintage,year,time)$( map_tec_time(node,inv_tec,
687687
*
688688
* Equation CAPACITY_MAINTENANCE_HIST
689689
* """"""""""""""""""""""""""""""""""
690-
* The following three constraints implement technology capacity maintenance over time to allow early retirment.
690+
* The following three constraints implement technology capacity maintenance over time to allow early retirement.
691691
* The optimization problem determines the optimal timing of retirement, when fixed operation-and-maintenance costs
692692
* exceed the benefit in the objective function.
693693
*

0 commit comments

Comments
 (0)