Repository navigation
fix: type check with numpy 2.5.4 isscalar stubs - #1031
Merged
FabianHofmann merged 2 commits intoOct 20, 2026
Merged
Conversation
numpy 2.5.4 widened the TypeIs of np.isscalar to include numbers.Number, which xarray's DataArray.__add__ does not accept, so mypy fails on the legacy scalar branch of _add_constant. Cast to the scalar members of ConstantLike; no runtime change. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Merging this PR will not alter performance
Comparing 
Footnotes
|
MaykThewessen
added a commit
to MaykThewessen/linopy
that referenced
this pull request
Oct 12, 2026
MaykThewessen
added a commit
to MaykThewessen/linopy
that referenced
this pull request
Oct 12, 2026
MaykThewessen
added a commit
to MaykThewessen/linopy
that referenced
this pull request
Oct 12, 2026
MaykThewessen
added a commit
to MaykThewessen/linopy
that referenced
this pull request
Oct 12, 2026
FabianHofmann
approved these changes
Oct 16, 2026
FabianHofmann
added a commit
that referenced
this pull request
Oct 21, 2026
* fix: type check with numpy 2.5.4 isscalar stubs (#1031) * fix: type check with numpy 2.5.4 isscalar stubs numpy 2.5.4 widened the TypeIs of np.isscalar to include numbers.Number, which xarray's DataArray.__add__ does not accept, so mypy fails on the legacy scalar branch of _add_constant. Cast to the scalar members of ConstantLike; no runtime change. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor: route legacy scalar add through _combined_with_constant instead of cast --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Fabian <fab.hof@gmx.de> (cherry picked from commit 86d6ad2) * fix: keep dash-named parameters in netcdf round trip (#1025) * fix: keep dash-named parameters, attributes and MultiIndex dims in read_netcdf read_netcdf assigned each data variable and attribute to its container by splitting the key at its last dash. Parameters are stored as parameters-<name>, so a parameter named my-param was assigned to parameters-my and dropped; the same happened to parameter attributes and _multiindex attributes of dimensions with a dash in their name. Keys now belong to the longest known container prefix. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix: type check with numpy 2.5.4 isscalar stubs numpy 2.5.4 widened the TypeIs of np.isscalar to include numbers.Number, which xarray's DataArray.__add__ does not accept, so mypy fails on the legacy scalar branch of _add_constant. Cast to the scalar members of ConstantLike; no runtime change. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs: move release note to upcoming version Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(io): compute netcdf key owners once * refactor(io): compactify netcdf key owner lookup --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Fabian <fab.hof@gmx.de> (cherry picked from commit 4117547) * fix(solvers): probe the Xpress licence, run solving tests on licensed solvers (#995) * fix(solvers): probe the Xpress licence, run solving tests on licensed solvers (#994) * test(io): to_mosek builds a task without a licence, gate it on available_solvers * test(io): name a mosek task without a licence, gate its set_names cases on available_solvers * test(io): gate the highs direct QP solve on licensed_solvers (cherry picked from commit 09d4fde) * fix: keep auxiliary coordinates of dense containers in netcdf round trip (#1024) * fix: keep auxiliary coordinates of dense containers in netcdf round trip read_netcdf dropped every non-index coordinate except MultiIndex levels to keep out the scalar coordinates of other containers that xarray attaches when selecting one container's data variables. That also dropped the auxiliary coordinates of dense variables, constraints, expressions and parameters, such as the levels on a flat dimension that v1 recommends instead of a MultiIndex. Only drop scalar coordinates owned by another container, matched on the longest prefix since names may contain dashes. Coordinates with dimensions only attach to the container whose dimensions they share. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test: drop narrative comments, cover dash-named parameter with scalar coord --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Fabian <fab.hof@gmx.de> (cherry picked from commit 44ff525) * docs: release notes for v0.10.1 --------- Co-authored-by: Mayk Thewessen <mayk_12@hotmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Note
AI-assisted. Claude found the cause and wrote the fix, and ran the checks listed below. I reviewed the diff.
Changes proposed in this Pull Request
"Check types" fails on every new CI run since numpy 2.5.4 (
linopy/expressions.py:1278: No overload variant of "__add__" ... matches argument type "Number"). numpy 2.5.4 addednumbers.Numberto theTypeIsofnp.isscalar, and xarray'sDataArray.__add__does not acceptNumber. This casts the scalar in the legacy_add_constantbranch tofloat | np.number, the scalar members ofConstantLike. No runtime change. This unblocks #1021, #1022, #1024 and #1025, among others.Checklist
AGENTS.md).doc.doc/release_notes.rstof the upcoming release is included.What was checked (AI-generated)
linopy/expressions.pytype-checks under numpy 2.5.3 and 2.5.4.test/test_linear_expression.pypasses.🤖 Generated with Claude Code