Merge branch 'u/chapoton/33146' in 9.6.beta0

Author: fchapoton

src/sage/combinat/cluster_algebra_quiver/mutation_class.py

@@ -22,7 +22,7 @@
 from sage.groups.perm_gps.partn_ref.refinement_graphs import search_tree, get_orbits
 from sage.rings.integer_ring import ZZ
 from sage.rings.infinity import infinity
-from sage.graphs.all import DiGraph
+from sage.graphs.digraph import DiGraph
 from sage.combinat.cluster_algebra_quiver.quiver_mutation_type import _edge_list_to_matrix
 
 

src/sage/combinat/cluster_algebra_quiver/mutation_type.py

@@ -27,8 +27,8 @@
 
 from sage.misc.cachefunc import cached_function
 from sage.misc.flatten import flatten
-from sage.graphs.all import DiGraph
-from sage.combinat.all import Combinations
+from sage.graphs.digraph import DiGraph
+from sage.combinat.combination import Combinations
 from sage.combinat.cluster_algebra_quiver.quiver_mutation_type import QuiverMutationType
 
 

src/sage/combinat/cluster_algebra_quiver/quiver.py

@@ -42,7 +42,8 @@
 from sage.rings.integer_ring import ZZ
 from sage.rings.cc import CC
 from sage.rings.infinity import infinity
-from sage.graphs.all import Graph, DiGraph
+from sage.graphs.digraph import DiGraph
+from sage.graphs.graph import Graph
 from sage.graphs.views import EdgesView
 from sage.arith.misc import gcd
 from sage.modules.free_module_element import vector

src/sage/combinat/cluster_algebra_quiver/quiver_mutation_type.py

@@ -25,7 +25,8 @@
 from sage.misc.cachefunc import cached_method
 from sage.rings.integer_ring import ZZ
 from sage.rings.infinity import infinity
-from sage.graphs.all import Graph, DiGraph
+from sage.graphs.digraph import DiGraph
+from sage.graphs.graph import Graph
 from sage.arith.all import binomial, euler_phi
 from sage.misc.misc_c import prod
 from sage.matrix.constructor import matrix

src/sage/combinat/cluster_complex.py

@@ -50,7 +50,7 @@
 from sage.categories.coxeter_groups import CoxeterGroups
 from sage.combinat.root_system.coxeter_group import CoxeterGroup
 from sage.combinat.subword_complex import SubwordComplex, SubwordComplexFacet
-from sage.rings.semirings.non_negative_integer_semiring import NN
+from sage.rings.semirings.all import NN
 
 
 class ClusterComplexFacet(SubwordComplexFacet):

src/sage/combinat/combinat.py

@@ -417,7 +417,7 @@ def bell_number(n, algorithm='flint', **options) -> Integer:
                 break
             b += v
             k += si
-        from sage.rings.all import RealField
+        from sage.rings.real_mpfr import RealField
         R = RealField(b.exact_log(2) + 1, rnd='RNDD')
         return ((R(-1).exp() / q) * b).ceil()
 

src/sage/combinat/combination.py

@@ -26,7 +26,8 @@
 # ****************************************************************************
 import itertools
 
-from sage.rings.all import ZZ, Integer
+from sage.rings.integer import Integer
+from sage.rings.integer_ring import ZZ
 from sage.arith.all import binomial
 from .integer_vector import IntegerVectors
 from sage.categories.finite_enumerated_sets import FiniteEnumeratedSets

src/sage/combinat/crystals/alcove_path.py

@@ -8,19 +8,18 @@
 - Travis Scrimshaw (2016-06-23): implemented `\mathcal{B}(\infty)`
 
 Special thanks to: Nicolas Borie, Anne Schilling, Travis Scrimshaw, and
-Nicolas Thiery.
+Nicolas Thiéry.
 """
-
-#*****************************************************************************
+# ****************************************************************************
 #       Copyright (C) 2008 Brant Jones <brant at math.ucdavis.edu>
 #       Copyright (C) 2013 Arthur Lubovsky <alubovsky at albany.edu>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
-#                  http://www.gnu.org/licenses/
-#*****************************************************************************
+#                  https://www.gnu.org/licenses/
+# ****************************************************************************
 
 from sage.structure.parent import Parent
 from sage.structure.element import Element
@@ -29,7 +28,7 @@
 from sage.structure.richcmp import richcmp
 from sage.categories.classical_crystals import ClassicalCrystals
 from sage.categories.loop_crystals import LoopCrystals
-from sage.graphs.all import DiGraph
+from sage.graphs.digraph import DiGraph
 from sage.combinat.root_system.cartan_type import CartanType
 from sage.combinat.root_system.root_system import RootSystem
 from sage.all import vector

src/sage/combinat/crystals/crystals.py

@@ -155,20 +155,14 @@
 #  The full text of the GPL is available at:
 #
 #                  http://www.gnu.org/licenses/
-#****************************************************************************
+# ***************************************************************************
 # Acknowledgment: most of the design and implementation of this
 # library is heavily inspired from MuPAD-Combinat.
-#****************************************************************************
-
-#from sage.structure.unique_representation import UniqueRepresentation
-#from sage.structure.parent import Parent
-#from sage.structure.element import Element
-#from sage.categories.finite_enumerated_sets import FiniteEnumeratedSets
-#from sage.graphs.all import DiGraph
-#from sage.combinat import ranker
-#from sage.combinat.root_system.weyl_characters import WeylCharacter
+# ***************************************************************************
+
 from sage.combinat.backtrack import GenericBacktracker
 
+
 class CrystalBacktracker(GenericBacktracker):
     def __init__(self, crystal, index_set=None):
         r"""

src/sage/combinat/crystals/tensor_product.py

@@ -51,7 +51,7 @@
         TensorProductOfSuperCrystalsElement, TensorProductOfQueerSuperCrystalsElement)
 from sage.misc.flatten import flatten
 from sage.structure.element import get_coercion_model
-from sage.rings.semirings.non_negative_integer_semiring import NN
+from sage.rings.semirings.all import NN
 from sage.arith.misc import integer_trunc as trunc