Skip to content

Commit

Permalink
Drop outdated pin of JPype on CI (#880)
Browse files Browse the repository at this point in the history
* Drop installing old JPype1 version
* Bump versions of conda installers
* Fix typo in docstring
  • Loading branch information
glatterf42 authored Oct 15, 2024
1 parent b5ad9d2 commit d3cf5bd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/conda.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@ jobs:
matrix:
os: [windows-latest, macos-latest]
conda:
- {installer: anaconda, version: 2023.03-1}
- {installer: miniconda, version: py310_23.3.1-0}
extra-deps: ["", "JPype1=1.2.1"]
- {installer: anaconda, version: 2024.06-1}
- {installer: miniconda, version: py312_24.7.1-0}
fail-fast: false

runs-on: ${{ matrix.os }}
name: ${{ matrix.os }}-${{ matrix.conda.installer }}-${{ matrix.extra-deps }}
name: ${{ matrix.os }}-${{ matrix.conda.installer }}

steps:
- name: Cache Anaconda installer, conda packages
Expand Down Expand Up @@ -70,7 +69,7 @@ jobs:
# Also install pytest and packages required for testing. pip/PyPI
# supports this via message_ix[testing], but conda does not.
conda create --quiet --name testenv message-ix ${{ matrix.extra-deps }} pytest asyncssh sphinx
conda create --quiet --name testenv message-ix pytest asyncssh sphinx
conda list --name testenv
- name: Check CLI commands and run test
Expand Down
2 changes: 1 addition & 1 deletion message_ix/model/MESSAGE/model_core.gms
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ CAPACITY_CONSTRAINT(node,inv_tec,vintage,year,time)$( map_tec_time(node,inv_tec,
*
* Equation CAPACITY_MAINTENANCE_HIST
* """"""""""""""""""""""""""""""""""
* The following three constraints implement technology capacity maintenance over time to allow early retirment.
* The following three constraints implement technology capacity maintenance over time to allow early retirement.
* The optimization problem determines the optimal timing of retirement, when fixed operation-and-maintenance costs
* exceed the benefit in the objective function.
*
Expand Down

0 comments on commit d3cf5bd

Please sign in to comment.