diff options
| author | Jarrod Millman <jarrod.millman@gmail.com> | 2021-10-23 15:37:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-23 15:37:48 -0700 |
| commit | 0c503e31ba0062dc9a4ed47c380481aa8d6978c8 (patch) | |
| tree | ef389b7ba52dec39941978824c7e0e833f17ab9e /networkx/classes | |
| parent | 27d362b9a752adf38d7db1828a48f50bb41c84bd (diff) | |
| download | networkx-0c503e31ba0062dc9a4ed47c380481aa8d6978c8.tar.gz | |
Drop Py37 (#5143)
* Drop Py37
* XML serialization issue
* Use math.comb
Co-authored-by: Simone Gasperini <simone.gasperini2@studio.unibo.it>
* Run pyupgrade --py38-plus
* Run black
* More documentation
* Deprecate euclidean
Co-authored-by: Simone Gasperini <simone.gasperini2@studio.unibo.it>
Diffstat (limited to 'networkx/classes')
| -rw-r--r-- | networkx/classes/function.py | 2 | ||||
| -rw-r--r-- | networkx/classes/ordered.py | 8 | ||||
| -rw-r--r-- | networkx/classes/tests/historical_tests.py | 2 | ||||
| -rw-r--r-- | networkx/classes/tests/test_digraph_historical.py | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/networkx/classes/function.py b/networkx/classes/function.py index fdc6f69f..6830e59a 100644 --- a/networkx/classes/function.py +++ b/networkx/classes/function.py @@ -1295,7 +1295,7 @@ def path_weight(G, path, weight): raise nx.NetworkXNoPath("path does not exist") for node, nbr in nx.utils.pairwise(path): if multigraph: - cost += min([v[weight] for v in G[node][nbr].values()]) + cost += min(v[weight] for v in G[node][nbr].values()) else: cost += G[node][nbr][weight] return cost diff --git a/networkx/classes/ordered.py b/networkx/classes/ordered.py index 67021e5a..778ed14c 100644 --- a/networkx/classes/ordered.py +++ b/networkx/classes/ordered.py @@ -73,7 +73,7 @@ class OrderedGraph(Graph): DeprecationWarning, stacklevel=2, ) - super(OrderedGraph, self).__init__(incoming_graph_data, **attr) + super().__init__(incoming_graph_data, **attr) class OrderedDiGraph(DiGraph): @@ -101,7 +101,7 @@ class OrderedDiGraph(DiGraph): DeprecationWarning, stacklevel=2, ) - super(OrderedDiGraph, self).__init__(incoming_graph_data, **attr) + super().__init__(incoming_graph_data, **attr) class OrderedMultiGraph(MultiGraph): @@ -130,7 +130,7 @@ class OrderedMultiGraph(MultiGraph): DeprecationWarning, stacklevel=2, ) - super(OrderedMultiGraph, self).__init__(incoming_graph_data, **attr) + super().__init__(incoming_graph_data, **attr) class OrderedMultiDiGraph(MultiDiGraph): @@ -159,4 +159,4 @@ class OrderedMultiDiGraph(MultiDiGraph): DeprecationWarning, stacklevel=2, ) - super(OrderedMultiDiGraph, self).__init__(incoming_graph_data, **attr) + super().__init__(incoming_graph_data, **attr) diff --git a/networkx/classes/tests/historical_tests.py b/networkx/classes/tests/historical_tests.py index daa5dbaf..612d55f4 100644 --- a/networkx/classes/tests/historical_tests.py +++ b/networkx/classes/tests/historical_tests.py @@ -404,7 +404,7 @@ class HistoricalTests: G.edges(), [("A", "B"), ("A", "C"), ("B", "D"), ("C", "B"), ("C", "D")] ) - assert sorted([v for k, v in G.degree()]) == [0, 0, 0, 2, 2, 3, 3] + assert sorted(v for k, v in G.degree()) == [0, 0, 0, 2, 2, 3, 3] assert sorted(G.degree(), key=str) == [ ("A", 2), ("B", 3), diff --git a/networkx/classes/tests/test_digraph_historical.py b/networkx/classes/tests/test_digraph_historical.py index 7047bbf3..403051fa 100644 --- a/networkx/classes/tests/test_digraph_historical.py +++ b/networkx/classes/tests/test_digraph_historical.py @@ -32,7 +32,7 @@ class TestDiGraphHistorical(HistoricalTests): G = self.G() G.add_nodes_from("GJK") G.add_edges_from([("A", "B"), ("A", "C"), ("B", "D"), ("B", "C"), ("C", "D")]) - assert sorted([v for k, v in G.in_degree()]) == [0, 0, 0, 0, 1, 2, 2] + assert sorted(v for k, v in G.in_degree()) == [0, 0, 0, 0, 1, 2, 2] assert dict(G.out_degree()) == { "A": 2, "C": 1, |