iiasa / ixmp

The ix modeling platform for integrated and cross-cutting scenario analysis
https://docs.messageix.org/ixmp
Apache License 2.0
38 stars 112 forks source link

Adjust test suite to JPype1.5.1 #550

Closed glatterf42 closed 3 days ago

glatterf42 commented 4 days ago

JPype1 just released their version 1.5.1, which now supports Python 3.13 :) Unfortunately, it also broke our CI test suite, but only two parts that we initially adjusted for Python 3.12 and JPype1 1.5.0, so this PR simply reverts these changes, hoping it should let the tests pass again.

How to review

PR checklist

codecov[bot] commented 4 days ago

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 98.9%. Comparing base (02c887a) to head (352cd7b). Report is 14 commits behind head on main.

Additional details and impacted files ```diff @@ Coverage Diff @@ ## main #550 +/- ## ======================================= - Coverage 98.9% 98.9% -0.1% ======================================= Files 44 44 Lines 4819 4816 -3 ======================================= - Hits 4769 4765 -4 - Misses 50 51 +1 ``` | [Files with missing lines](https://app.codecov.io/gh/iiasa/ixmp/pull/550?dropdown=coverage&src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=iiasa) | Coverage Δ | | |---|---|---| | [ixmp/tests/core/test\_scenario.py](https://app.codecov.io/gh/iiasa/ixmp/pull/550?src=pr&el=tree&filepath=ixmp%2Ftests%2Fcore%2Ftest_scenario.py&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=iiasa#diff-aXhtcC90ZXN0cy9jb3JlL3Rlc3Rfc2NlbmFyaW8ucHk=) | `100.0% <ø> (ø)` | | | [ixmp/tests/test\_cli.py](https://app.codecov.io/gh/iiasa/ixmp/pull/550?src=pr&el=tree&filepath=ixmp%2Ftests%2Ftest_cli.py&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=iiasa#diff-aXhtcC90ZXN0cy90ZXN0X2NsaS5weQ==) | `100.0% <100.0%> (ø)` | | ... and [1 file with indirect coverage changes](https://app.codecov.io/gh/iiasa/ixmp/pull/550/indirect-changes?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=iiasa)

🚨 Try these New Features:

khaeru commented 4 days ago

Is this the last thing we were waiting on to complete and merge #544? Can we maybe cherry-pick this commit onto the branch for that PR and rebase it?

glatterf42 commented 4 days ago

Not so sure: I tried what you suggested, but we still see error messages from bottle and pretenders. These might come down to https://github.com/pretenders/pretenders/issues/153, i.e. pretenders not being maintained anymore, while the latest bottle version actually supports Python 3.13. I'm not too sure what we can do about that. To get the CI to pass again tomorrow, I'd be in favor of merging this PR first.

khaeru commented 4 days ago

These might come down to pretenders/pretenders#153, i.e. pretenders not being maintained anymore, while the latest bottle version actually supports Python 3.13. I'm not too sure what we can do about that.

This one wasn't in the description of #544, so reading the description I had the wrong impression that all upstream issues were resolved. I'll add it now.

glatterf42 commented 3 days ago

Superseded by #544.