From d3cf5bd5c16c0e2a02cdf1c43942c0a16b7b084c Mon Sep 17 00:00:00 2001
From: Fridolin Glatter <83776373+glatterf42@users.noreply.github.com>
Date: Tue, 15 Oct 2024 13:33:26 +0200
Subject: [PATCH] Drop outdated pin of JPype on CI (#880)

* Drop installing old JPype1 version
* Bump versions of conda installers
* Fix typo in docstring
---
 .github/workflows/conda.yaml            | 9 ++++-----
 message_ix/model/MESSAGE/model_core.gms | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/conda.yaml b/.github/workflows/conda.yaml
index d216fc0cc..1820a15cf 100644
--- a/.github/workflows/conda.yaml
+++ b/.github/workflows/conda.yaml
@@ -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
@@ -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
diff --git a/message_ix/model/MESSAGE/model_core.gms b/message_ix/model/MESSAGE/model_core.gms
index e549c7fb1..8fcb836e6 100644
--- a/message_ix/model/MESSAGE/model_core.gms
+++ b/message_ix/model/MESSAGE/model_core.gms
@@ -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.
 *