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.

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

Miscellaneous improvements for 2022-W30 #451

Merged
merged 8 commits into from
Aug 15, 2022
Merged

Miscellaneous improvements for 2022-W30 #451

merged 8 commits into from
Aug 15, 2022

Conversation

khaeru
Copy link
Member

@khaeru khaeru commented Jul 26, 2022

  • Adjust to genno 1.12 and set this as the minimum required version.
  • Handle a ValueError in TimeSeries.add_timeseries() / JDBCBackend.set_data(); partly addresses Raise Pythonic exceptions in JDBCBackend #296.
  • Bugfix in ixmp._config.Config: config values loaded from file were squashed with defaults, if (and only if) those defaults were set downstream, e.g. in message-ix, message-ix-models, or message-data. Preserve the values, as expected.
  • Improve .reporting.computations.update_ts():
    • Use TimeSeries.check_out(…, timeseries_only=True).
    • Tolerate failure to add each individual item, add optional strict argument.
  • Simplify units handling in .reporting.computations.update_scenario()

How to review

  • Read the diff and note that the CI checks all pass.

PR checklist

  • Continuous integration checks all ✅
  • Add or expand tests; coverage checks both ✅
  • Add, expand, or update documentation.
  • Update release notes.

@khaeru khaeru added the enh New features & functionality label Jul 26, 2022
@khaeru khaeru self-assigned this Jul 26, 2022
@codecov
Copy link

codecov bot commented Aug 12, 2022

Codecov Report

Merging #451 (d22f5ec) into main (e795853) will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@          Coverage Diff          @@
##            main    #451   +/-   ##
=====================================
  Coverage   98.6%   98.6%           
=====================================
  Files         42      42           
  Lines       4446    4460   +14     
=====================================
+ Hits        4384    4398   +14     
  Misses        62      62           
Impacted Files Coverage Δ
ixmp/tests/reporting/test_reporter.py 100.0% <ø> (ø)
ixmp/_config.py 96.7% <100.0%> (-0.1%) ⬇️
ixmp/backend/jdbc.py 95.2% <100.0%> (+<0.1%) ⬆️
ixmp/model/base.py 100.0% <100.0%> (ø)
ixmp/reporting/computations.py 100.0% <100.0%> (ø)
ixmp/reporting/reporter.py 100.0% <100.0%> (ø)
ixmp/tests/reporting/test_computations.py 100.0% <100.0%> (ø)

@khaeru khaeru added backend.jdbc Interaction with ixmp_source via JDBCBackend & JPype bug labels Aug 15, 2022
@khaeru khaeru merged commit 54b0c9f into main Aug 15, 2022
@khaeru khaeru deleted the enh/2022-W30 branch August 15, 2022 16:36
@khaeru khaeru added this to the 3.6 milestone Aug 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backend.jdbc Interaction with ixmp_source via JDBCBackend & JPype bug enh New features & functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant