Replace imports from sage.graphs.all by more specific imports

[mkoeppe]

Depends on #32989
Depends on #32999
Depends on #33007

CC: @fchapoton @tobiasdiez @dcoudert

Component: refactoring

Author: Matthias Koeppe

Branch/Commit: 1dbef4d

Reviewer: David Coudert

Issue created by migration from https://trac.sagemath.org/ticket/33199

[mkoeppe]

Author: Matthias Koeppe

[mkoeppe]

Branch: u/mkoeppe/replace_imports_from_sage_graphs_all_by_more_specific_imports

[mkoeppe]

Last 10 new commits:

a9b7517	git grep -l 'interfaces.all import' | xargs sed -E -i.bak 's/interfaces[.]all import ([a-z][a-z]*)/interfaces.\1 import \1/'
607316f	Remove remaining imports from sage.interfaces.all
0e814dc	Merge #32989
37789fd	Merge tag '9.5.beta9' into t/33007/remove_imports_from_sage_interfaces_all
584d121	src/sage/rings/polynomial/multi_polynomial_libsingular.pyx: Fix import
89e99f5	Merge #33007
84a887e	Merge #32999
0694b04	git grep -l 'graphs.all.*import' | xargs sed -E -i.bak $'s/^( *)from sage.*all import Graph, DiGraph *$/\1from sage.graphs.graph import Graph\n\1from sage.graphs.digraph import Digraph/;s/from sage.*all import Graph/from sage.graphs.graph import Graph/;s/from sage.*all import DiGraph/from sage.graphs.digraph import DiGraph/;'
5ec356b	git grep -l 'graphs.all.*import' | xargs sed -E -i.bak 's/from sage.graphs.all import graphs/from sage.graphs.graph_generators import graphs/'
cfb1086	src/sage/matroids/utilities.py: Replace imports from sage.graphs.all, sage.rings.all

[mkoeppe]

Commit: cfb1086

[mkoeppe]

Dependencies: #32989, #32999, #33007

[dcoudert]

comment:5

in b/src/sage/sandpiles/sandpile.py the following change is not correct

-from sage.graphs.all import DiGraph, Graph
+from sage.graphs.digraph import DiGraph, Graph

[sagetrac-git]

Changed commit from cfb1086 to f12c46f

[sagetrac-git]

Branch pushed to git repo; I updated commit sha1. New commits:

f12c46f

src/sage/sandpiles/sandpile.py: Fix up imports

[fchapoton]

comment:7

hmmm

[2/2] Cythonizing sage/matroids/linear_matroid.pyx

Error compiling Cython file:
------------------------------------------------------------
...
    cdef int isdigraph

    from sage.graphs.graph import Graph
    from sage.graphs.digraph import Digraph

    if isinstance(G, DiGraph):

[dcoudert]

comment:8

Right, Digraph instead of DiGraph

[dcoudert]

comment:9

same issue several times in b/src/sage/graphs/generic_graph.py like

@@ -22848,7 +22849,8 @@ class GenericGraph(GenericGraph_pyx):
             G2 = other
             partition2 = other_vertices
         G_to = {u: i for i,u in enumerate(self_vertices)}
-        from sage.graphs.all import Graph, DiGraph
+        from sage.graphs.graph import Graph
+        from sage.graphs.digraph import Digraph

and also in b/src/sage/groups/perm_gps/partn_ref/refinement_graphs.pyx

[sagetrac-git]

Branch pushed to git repo; I updated commit sha1. New commits:

1dbef4d

git grep -l 'import Digraph' | xargs sed -i.bak 's/import Digraph/import DiGraph/'

[sagetrac-git]

Changed commit from f12c46f to 1dbef4d

[mkoeppe]

comment:11

Sorry, typo'd in one of my substitution commands

[dcoudert]

Reviewer: David Coudert

[dcoudert]

comment:12

LGTM.

[mkoeppe]

comment:13

Thanks!

[dcoudert]

comment:14

For information, I have tested the ticket with 9.5.rc3.

[vbraun]

Changed branch from u/mkoeppe/replace_imports_from_sage_graphs_all_by_more_specific_imports to 1dbef4d