Bump networkx to 3.2.1 #11336
Merged
Bump networkx to 3.2.1 #11336
Conversation
This file contains 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
Release: https://pypi.org/pypi/networkx/3.2.1 Homepage: https://networkx.org/ Repository: https://github.com/networkx/networkx If stubtest fails for this PR: - Leave this PR open (as a reminder, and to prevent stubsabot from opening another PR) - Fix stubtest failures in another PR, then close this PR Note that you will need to close and re-open the PR in order to trigger CI
…etworkx-to-3.2.1
Avasam
commented
Jan 29, 2024
| # Correct usage | ||
| assert_type(some_method(0, ""), float) | ||
| # type system doesn't allow this yet (see comment in networkx/utils/backends.pyi) | ||
| # assert_type(some_method(0, "", backend=None), float) |
There was a problem hiding this comment.
This would require some way of concatenating backend to _P.kwargs. Which to my understanding, isn't currently possible and is a rejected idea in https://peps.python.org/pep-0612/#concatenating-keyword-parameters
This comment has been minimized.
This comment has been minimized.
Avasam
commented
Jan 29, 2024
| @overload | ||
| def cliques_containing_node( | ||
| G: Graph[_Node], nodes: _Node, cliques: Iterable[Container[_Node]] | None = None | ||
| ) -> Generator[list[_Node], None, None]: ... |
There was a problem hiding this comment.
These methods have been removed
Avasam
commented
Jan 29, 2024
| ) -> OutMultiEdgeDataView[_Node, tuple[_Node, _Node, _U]]: ... | ||
| @overload # type: ignore[override] # Has an additional `keys` keyword argument |
There was a problem hiding this comment.
Source has improved overridden methods arguments
Avasam
commented
Jan 29, 2024
| @@ -87,14 +84,14 @@ def set_node_attributes( | |||
| values: SupportsItems[_Node, SupportsKeysAndGetItem[Incomplete, Incomplete] | Iterable[tuple[Incomplete, Incomplete]]], | |||
| name: None = None, | |||
| ) -> None: ... | |||
| def get_node_attributes(G: Graph[_Node], name: str) -> dict[_Node, Incomplete]: ... | |||
There was a problem hiding this comment.
New arguments and less re-exports in this file
Avasam
commented
Jan 29, 2024
| ) -> DiGraph[_Node]: ... | ||
| @overload | ||
| def subgraph_view( | ||
| G: Graph[_Node], filter_node: Callable[[_Node], bool] = ..., filter_edge: Callable[[_Node, _Node], bool] = ... |
There was a problem hiding this comment.
simple kw-only change on this method
Avasam
commented
Jan 29, 2024
| def node_link_data( | ||
| G, | ||
| attrs: Incomplete | None = None, |
Avasam
commented
Jan 29, 2024
Comment on lines
+29
to
+59
| def __new__( | ||
| cls, | ||
| func: Callable[_P, _R] | None = None, | ||
| *, | ||
| name: str | None = None, | ||
| graphs: str | None | Mapping[str, int] = "G", | ||
| edge_attrs: str | dict[str, Any] | None = None, | ||
| node_attrs: str | dict[str, Any] | None = None, | ||
| preserve_edge_attrs: bool = False, | ||
| preserve_node_attrs: bool = False, | ||
| preserve_graph_attrs: bool = False, | ||
| preserve_all_attrs: bool = False, | ||
| ) -> Self: ... | ||
| @property | ||
| def __doc__(self): ... | ||
| @__doc__.setter | ||
| def __doc__(self, val) -> None: ... | ||
| @property | ||
| def __signature__(self): ... | ||
| # Type system limitations doesn't allow us to define this as it truly should. | ||
| # But specifying backend with backend_kwargs isn't a common usecase anyway | ||
| # and specifying backend as explicitely None is possible but not intended. | ||
| # If this ever changes, update stubs/networkx/@tests/test_cases/check_dispatch_decorator.py | ||
| @overload | ||
| def __call__(self, *args: _P.args, **kwargs: _P.kwargs) -> _R: ... | ||
| @overload | ||
| def __call__(self, *args: Any, backend: str, **backend_kwargs: Any) -> _R: ... | ||
| # @overload | ||
| # def __call__(self, *args: _P.args, backend: None = None, **kwargs: _P.kwargs) -> _R: ... | ||
| # @overload | ||
| # def __call__(self, *args: _P.args, backend: str, **kwargs: _P.kwargs, **backend_kwargs: Any) -> _R: ... |
There was a problem hiding this comment.
I've only completed __new__ and __call__ here.
As far as I know, I'm limited by the type system here because I can't concatenate kwargs, Please let me know if there's a way to actually do it.
Avasam
commented
Jan 29, 2024
This comment has been minimized.
This comment has been minimized.
Avasam
commented
Jan 29, 2024
| from networkx.linalg import * | ||
| from networkx.readwrite import * | ||
| from networkx.relabel import * | ||
| from networkx.utils.backends import _dispatch as _dispatch |
There was a problem hiding this comment.
New re-exports (but they're also private, could be omitted)
srittau
previously approved these changes
Jan 29, 2024
This comment has been minimized.
This comment has been minimized.
|
Some genuine regression test errors. |
This comment has been minimized.
This comment has been minimized.
Avasam
commented
Jan 30, 2024
|
According to mypy_primer, this change has no effect on the checked open source code. 🤖🎉 |
srittau
approved these changes
Jan 31, 2024
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.
Follow-up to #10544
Closes #11169
I hit a couple limitations along the way, I'll open and link relevant issues
I've added github comments to files that were more than just adding
@_dispatchdecorator to make them easier to find and review.