Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop outdated pin of JPype on CI #880

Merged
merged 3 commits into from
Oct 15, 2024
Merged

Drop outdated pin of JPype on CI #880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e2fc6b
Drop installing old JPype1 version
glatterf42 Oct 14, 2024
bd5d8b9
Bump versions of conda installers
glatterf42 Oct 14, 2024
c0356b6
Fix typo in docstring
glatterf42 Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/conda.yaml
View file
Open in desktop
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
View file
Open in desktop
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
Loading