Skip to content

NetworkX: Allow version 3.2 #36577

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

Merged
merged 5 commits into from
Nov 5, 2023
Merged

NetworkX: Allow version 3.2 #36577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb1aa91
build/pkgs/{networkx,scipy,ipywidgets}: Update version range in distr…
mkoeppe Sep 27, 2023
fe163ac
Support networkx 3.2
tornaria Oct 25, 2023
2915af4
Merge branch 'networkx-3.2' into networkx_version_ranges_include_3_2
mkoeppe Oct 29, 2023
3d199b9
Merge branch 'conda_txt_networkx' into networkx_version_ranges_includ…
mkoeppe Oct 29, 2023
8a94657
build/pkgs/networkx: Allow networkx 3.2
mkoeppe Oct 29, 2023
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
2 changes: 1 addition & 1 deletion build/pkgs/ipywidgets/distros/conda.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ipywidgets<8.0.0
ipywidgets>=7.5.1
2 changes: 1 addition & 1 deletion build/pkgs/networkx/distros/conda.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
networkx<3.0,>=2.4
networkx<3.3,>=2.4
2 changes: 1 addition & 1 deletion build/pkgs/networkx/install-requires.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
networkx >=2.4, <3.2
networkx >=2.4, <3.3
2 changes: 1 addition & 1 deletion build/pkgs/scipy/distros/conda.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
scipy<1.11,>=1.5
scipy<1.12,>=1.5
10 changes: 5 additions & 5 deletions src/sage/graphs/generic_graph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5102,13 +5102,13 @@ def cycle_basis(self, output='vertex'):
A cycle basis in Petersen's Graph ::

sage: g = graphs.PetersenGraph()
sage: g.cycle_basis() # needs networkx
sage: g.cycle_basis() # needs networkx, random (changes in networkx 3.2)
[[1, 6, 8, 5, 0], [4, 9, 6, 8, 5, 0], [7, 9, 6, 8, 5],
[4, 3, 8, 5, 0], [1, 2, 3, 8, 5, 0], [7, 2, 3, 8, 5]]

One can also get the result as a list of lists of edges::

sage: g.cycle_basis(output='edge') # needs networkx
sage: g.cycle_basis(output='edge') # needs networkx, random (changes in networkx 3.2)
[[(1, 6, None), (6, 8, None), (8, 5, None), (5, 0, None),
(0, 1, None)], [(4, 9, None), (9, 6, None), (6, 8, None),
(8, 5, None), (5, 0, None), (0, 4, None)], [(7, 9, None),
Expand Down Expand Up @@ -5273,17 +5273,17 @@ def minimum_cycle_basis(self, algorithm=None, weight_function=None, by_weight=Fa
[[1, 2, 3], [1, 2, 3, 4], [5, 6, 7]]
sage: sorted(g.minimum_cycle_basis(by_weight=False))
[[1, 2, 3], [1, 3, 4], [5, 6, 7]]
sage: sorted(g.minimum_cycle_basis(by_weight=True, algorithm='NetworkX')) # needs networkx
sage: sorted(g.minimum_cycle_basis(by_weight=True, algorithm='NetworkX')) # needs networkx, random (changes in networkx 3.2)
[[1, 2, 3], [1, 2, 3, 4], [5, 6, 7]]
sage: g.minimum_cycle_basis(by_weight=False, algorithm='NetworkX') # needs networkx
sage: g.minimum_cycle_basis(by_weight=False, algorithm='NetworkX') # needs networkx, random (changes in networkx 3.2)
[[1, 2, 3], [1, 3, 4], [5, 6, 7]]

::

sage: g = Graph([(1, 2), (2, 3), (3, 4), (4, 5), (5, 1), (5, 3)])
sage: sorted(g.minimum_cycle_basis(by_weight=False))
[[1, 2, 3, 5], [3, 4, 5]]
sage: sorted(g.minimum_cycle_basis(by_weight=False, algorithm='NetworkX')) # needs networkx
sage: sorted(g.minimum_cycle_basis(by_weight=False, algorithm='NetworkX')) # needs networkx, random (changes in networkx 3.2)
[[1, 2, 3, 5], [3, 4, 5]]

TESTS::
Expand Down