Skip to content

Commit 1858f07

Browse files
author
Release Manager
committed
sagemathgh-38030: Relative to absolute imports, `del lazy_import` in `.all` files <!-- ^ Please provide a concise and informative title. --> <!-- ^ Don't put issue numbers in the title, do this in the PR description below. --> <!-- ^ For example, instead of "Fixes sagemath#12345" use "Introduce new method to calculate 1 + 2". --> <!-- v Describe your changes below in detail. --> <!-- v Why is this change required? What problem does it solve? --> <!-- v If this PR resolves an open issue, please link to it here. For example, "Fixes sagemath#12345". --> - Split out from sagemath#37900 ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [x] The title is concise and informative. - [ ] The description explains in detail what this PR is about. - [x] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation and checked the documentation preview. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - sagemath#12345: short description why this is a dependency --> <!-- - sagemath#34567: ... --> URL: sagemath#38030 Reported by: Matthias Köppe Reviewer(s):
2 parents 6d02e7b + e3bd5b0 commit 1858f07

File tree

79 files changed

+638
-608
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+638
-608
lines changed

src/sage/algebras/all.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222

2323
import sage.algebras.catalog as algebras
2424

25-
from .quatalg.all import *
26-
from .steenrod.all import *
27-
from .fusion_rings.all import *
28-
from .lie_algebras.all import *
29-
from .quantum_groups.all import *
30-
from .lie_conformal_algebras.all import *
25+
from sage.algebras.quatalg.all import *
26+
from sage.algebras.steenrod.all import *
27+
from sage.algebras.fusion_rings.all import *
28+
from sage.algebras.lie_algebras.all import *
29+
from sage.algebras.quantum_groups.all import *
30+
from sage.algebras.lie_conformal_algebras.all import *
3131

3232
# Algebra base classes
33-
from .free_algebra import FreeAlgebra
34-
from .free_algebra_quotient import FreeAlgebraQuotient
33+
from sage.algebras.free_algebra import FreeAlgebra
34+
from sage.algebras.free_algebra_quotient import FreeAlgebraQuotient
3535

36-
from .finite_dimensional_algebras.all import FiniteDimensionalAlgebra
36+
from sage.algebras.finite_dimensional_algebras.all import FiniteDimensionalAlgebra
3737

3838
lazy_import('sage.algebras.group_algebra', 'GroupAlgebra')
3939

@@ -52,8 +52,8 @@
5252

5353
lazy_import('sage.algebras.shuffle_algebra', 'ShuffleAlgebra')
5454

55-
from .clifford_algebra import CliffordAlgebra, ExteriorAlgebra
56-
from .weyl_algebra import DifferentialWeylAlgebra
55+
from sage.algebras.clifford_algebra import CliffordAlgebra, ExteriorAlgebra
56+
from sage.algebras.weyl_algebra import DifferentialWeylAlgebra
5757

5858
lazy_import('sage.algebras.commutative_dga', 'GradedCommutativeAlgebra')
5959

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
from .finite_dimensional_algebra import FiniteDimensionalAlgebra
1+
from sage.algebras.finite_dimensional_algebras.finite_dimensional_algebra import FiniteDimensionalAlgebra

src/sage/algebras/quatalg/all.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
from .quaternion_algebra import QuaternionAlgebra
1+
from sage.algebras.quatalg.quaternion_algebra import QuaternionAlgebra

src/sage/algebras/steenrod/all.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""
22
The Steenrod algebra
33
"""
4-
from .steenrod_algebra import SteenrodAlgebra, Sq
4+
from sage.algebras.steenrod.steenrod_algebra import SteenrodAlgebra, Sq
55
from sage.misc.lazy_import import lazy_import
66
lazy_import('sage.algebras.steenrod.steenrod_algebra_bases',
77
'steenrod_algebra_basis',

src/sage/all.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959

6060
################ end setup warnings ###############################
6161

62-
from .all__sagemath_repl import * # includes .all__sagemath_objects, .all__sagemath_environment
62+
from sage.all__sagemath_repl import * # includes .all__sagemath_objects, .all__sagemath_environment
6363

6464
###################################################################
6565

src/sage/all__sagemath_categories.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from .all__sagemath_objects import *
1+
from sage.all__sagemath_objects import *
22

33
from sage.categories.all import *
44

src/sage/all__sagemath_repl.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@
9797
r"removed from itertools in Python 3.14.")
9898

9999

100-
from .all__sagemath_objects import *
101-
from .all__sagemath_environment import *
100+
from sage.all__sagemath_objects import *
101+
from sage.all__sagemath_environment import *
102102

103103
from sage.doctest.all import *
104104
from sage.repl.all import *

src/sage/calculus/transforms/all.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22

33
lazy_import("sage.calculus.transforms.fft", ["FastFourierTransform", "FFT"])
44
lazy_import("sage.calculus.transforms.dwt", ["WaveletTransform", "DWT"])
5-
from .dft import IndexedSequence
5+
from sage.calculus.transforms.dft import IndexedSequence
6+
del lazy_import

src/sage/coding/source_coding/all.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
from .huffman import Huffman
1+
from sage.coding.source_coding.huffman import Huffman

src/sage/combinat/all.py

+51-51
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@
5050
install_doc(__package__, __doc__)
5151

5252
# install modules quickref and tutorial to the containing package
53-
from . import quickref, tutorial
53+
from sage.combinat import quickref, tutorial
5454
install_dict(__package__, {'quickref': quickref, 'tutorial': tutorial})
5555
del quickref, tutorial
5656

5757
from sage.misc.lazy_import import lazy_import
5858

59-
from .combinat import (CombinatorialObject,
59+
from sage.combinat.combinat import (CombinatorialObject,
6060
bell_number, bell_polynomial, bernoulli_polynomial,
6161
catalan_number, euler_number,
6262
fibonacci, fibonacci_sequence, fibonacci_xrange,
@@ -65,54 +65,54 @@
6565
polygonal_number, stirling_number1, stirling_number2,
6666
tuples, unordered_tuples)
6767

68-
from .expnums import expnums
68+
from sage.combinat.expnums import expnums
6969

7070
from sage.combinat.chas.all import *
7171
from sage.combinat.crystals.all import *
72-
from .rigged_configurations.all import *
72+
from sage.combinat.rigged_configurations.all import *
7373

7474
from sage.combinat.dlx import DLXMatrix, AllExactCovers, OneExactCover
7575

7676
# block designs, etc
7777
from sage.combinat.designs.all import *
7878

7979
# Free modules and friends
80-
from .free_module import CombinatorialFreeModule
81-
from .debruijn_sequence import DeBruijnSequences
80+
from sage.combinat.free_module import CombinatorialFreeModule
81+
from sage.combinat.debruijn_sequence import DeBruijnSequences
8282

83-
from .schubert_polynomial import SchubertPolynomialRing
83+
from sage.combinat.schubert_polynomial import SchubertPolynomialRing
8484
lazy_import('sage.combinat.key_polynomial', 'KeyPolynomialBasis', as_='KeyPolynomials')
85-
from .symmetric_group_algebra import SymmetricGroupAlgebra, HeckeAlgebraSymmetricGroupT
86-
from .symmetric_group_representations import SymmetricGroupRepresentation, SymmetricGroupRepresentations
87-
from .yang_baxter_graph import YangBaxterGraph
85+
from sage.combinat.symmetric_group_algebra import SymmetricGroupAlgebra, HeckeAlgebraSymmetricGroupT
86+
from sage.combinat.symmetric_group_representations import SymmetricGroupRepresentation, SymmetricGroupRepresentations
87+
from sage.combinat.yang_baxter_graph import YangBaxterGraph
8888

8989
# Permutations
90-
from .permutation import Permutation, Permutations, Arrangements, CyclicPermutations, CyclicPermutationsOfPartition
91-
from .affine_permutation import AffinePermutationGroup
90+
from sage.combinat.permutation import Permutation, Permutations, Arrangements, CyclicPermutations, CyclicPermutationsOfPartition
91+
from sage.combinat.affine_permutation import AffinePermutationGroup
9292
lazy_import('sage.combinat.colored_permutations', ['ColoredPermutations',
9393
'SignedPermutation',
9494
'SignedPermutations'])
95-
from .derangements import Derangements
95+
from sage.combinat.derangements import Derangements
9696
lazy_import('sage.combinat.baxter_permutations', ['BaxterPermutations'])
9797

9898
# RSK
99-
from .rsk import RSK, RSK_inverse, robinson_schensted_knuth, robinson_schensted_knuth_inverse, InsertionRules
99+
from sage.combinat.rsk import RSK, RSK_inverse, robinson_schensted_knuth, robinson_schensted_knuth_inverse, InsertionRules
100100

101101
# HillmanGrassl
102102
lazy_import("sage.combinat.hillman_grassl", ["WeakReversePlanePartition", "WeakReversePlanePartitions"])
103103

104104
# PerfectMatchings
105-
from .perfect_matching import PerfectMatching, PerfectMatchings
105+
from sage.combinat.perfect_matching import PerfectMatching, PerfectMatchings
106106

107107
# Integer lists
108-
from .integer_lists import IntegerListsLex
108+
from sage.combinat.integer_lists import IntegerListsLex
109109

110110
# Compositions
111-
from .composition import Composition, Compositions
112-
from .composition_signed import SignedCompositions
111+
from sage.combinat.composition import Composition, Compositions
112+
from sage.combinat.composition_signed import SignedCompositions
113113

114114
# Partitions
115-
from .partition import (Partition, Partitions, PartitionsInBox,
115+
from sage.combinat.partition import (Partition, Partitions, PartitionsInBox,
116116
OrderedPartitions, PartitionsGreatestLE,
117117
PartitionsGreatestEQ, number_of_partitions)
118118

@@ -121,13 +121,13 @@
121121
lazy_import('sage.combinat.skew_partition', ['SkewPartition', 'SkewPartitions'])
122122

123123
# Partition algebra
124-
from .partition_algebra import SetPartitionsAk, SetPartitionsPk, SetPartitionsTk, SetPartitionsIk, SetPartitionsBk, SetPartitionsSk, SetPartitionsRk, SetPartitionsPRk
124+
from sage.combinat.partition_algebra import SetPartitionsAk, SetPartitionsPk, SetPartitionsTk, SetPartitionsIk, SetPartitionsBk, SetPartitionsSk, SetPartitionsRk, SetPartitionsPRk
125125

126126
# Raising operators
127127
lazy_import('sage.combinat.partition_shifting_algebras', 'ShiftingOperatorAlgebra')
128128

129129
# Diagram algebra
130-
from .diagram_algebras import PartitionAlgebra, BrauerAlgebra, TemperleyLiebAlgebra, PlanarAlgebra, PropagatingIdeal
130+
from sage.combinat.diagram_algebras import PartitionAlgebra, BrauerAlgebra, TemperleyLiebAlgebra, PlanarAlgebra, PropagatingIdeal
131131

132132
# Descent algebra
133133
lazy_import('sage.combinat.descent_algebra', 'DescentAlgebra')
@@ -137,24 +137,24 @@
137137
['VectorPartition', 'VectorPartitions'])
138138

139139
# Similarity class types
140-
from .similarity_class_type import PrimarySimilarityClassType, PrimarySimilarityClassTypes, SimilarityClassType, SimilarityClassTypes
140+
from sage.combinat.similarity_class_type import PrimarySimilarityClassType, PrimarySimilarityClassTypes, SimilarityClassType, SimilarityClassTypes
141141

142142
# Cores
143-
from .core import Core, Cores
143+
from sage.combinat.core import Core, Cores
144144

145145
# Tableaux
146146
lazy_import('sage.combinat.tableau',
147147
["Tableau", "SemistandardTableau", "StandardTableau", "RowStandardTableau", "IncreasingTableau",
148148
"Tableaux", "SemistandardTableaux", "StandardTableaux", "RowStandardTableaux", "IncreasingTableaux"])
149-
from .skew_tableau import SkewTableau, SkewTableaux, StandardSkewTableaux, SemistandardSkewTableaux
150-
from .ribbon_shaped_tableau import RibbonShapedTableau, RibbonShapedTableaux, StandardRibbonShapedTableaux
151-
from .ribbon_tableau import RibbonTableaux, RibbonTableau, MultiSkewTableaux, MultiSkewTableau, SemistandardMultiSkewTableaux
152-
from .composition_tableau import CompositionTableau, CompositionTableaux
149+
from sage.combinat.skew_tableau import SkewTableau, SkewTableaux, StandardSkewTableaux, SemistandardSkewTableaux
150+
from sage.combinat.ribbon_shaped_tableau import RibbonShapedTableau, RibbonShapedTableaux, StandardRibbonShapedTableaux
151+
from sage.combinat.ribbon_tableau import RibbonTableaux, RibbonTableau, MultiSkewTableaux, MultiSkewTableau, SemistandardMultiSkewTableaux
152+
from sage.combinat.composition_tableau import CompositionTableau, CompositionTableaux
153153

154154
lazy_import('sage.combinat.tableau_tuple',
155155
['TableauTuple', 'StandardTableauTuple', 'RowStandardTableauTuple',
156156
'TableauTuples', 'StandardTableauTuples', 'RowStandardTableauTuples'])
157-
from .k_tableau import WeakTableau, WeakTableaux, StrongTableau, StrongTableaux
157+
from sage.combinat.k_tableau import WeakTableau, WeakTableaux, StrongTableau, StrongTableaux
158158
lazy_import('sage.combinat.lr_tableau', ['LittlewoodRichardsonTableau',
159159
'LittlewoodRichardsonTableaux'])
160160
lazy_import('sage.combinat.shifted_primed_tableau', ['ShiftedPrimedTableaux',
@@ -165,14 +165,14 @@
165165
["StandardSuperTableau", "SemistandardSuperTableau", "StandardSuperTableaux", "SemistandardSuperTableaux"])
166166

167167
# Words
168-
from .words.all import *
168+
from sage.combinat.words.all import *
169169

170170
lazy_import('sage.combinat.subword', 'Subwords')
171171

172-
from .graph_path import GraphPaths
172+
from sage.combinat.graph_path import GraphPaths
173173

174174
# Tuples
175-
from .tuple import Tuples, UnorderedTuples
175+
from sage.combinat.tuple import Tuples, UnorderedTuples
176176

177177
# Alternating sign matrices
178178
lazy_import('sage.combinat.alternating_sign_matrix', ('AlternatingSignMatrix',
@@ -196,53 +196,53 @@
196196
['ParkingFunctions', 'ParkingFunction'])
197197

198198
# Trees and Tamari interval posets
199-
from .ordered_tree import (OrderedTree, OrderedTrees,
199+
from sage.combinat.ordered_tree import (OrderedTree, OrderedTrees,
200200
LabelledOrderedTree, LabelledOrderedTrees)
201-
from .binary_tree import (BinaryTree, BinaryTrees,
201+
from sage.combinat.binary_tree import (BinaryTree, BinaryTrees,
202202
LabelledBinaryTree, LabelledBinaryTrees)
203203
lazy_import('sage.combinat.interval_posets', ['TamariIntervalPoset', 'TamariIntervalPosets'])
204204
lazy_import('sage.combinat.rooted_tree', ('RootedTree', 'RootedTrees',
205205
'LabelledRootedTree', 'LabelledRootedTrees'))
206206

207-
from .combination import Combinations
207+
from sage.combinat.combination import Combinations
208208

209-
from .set_partition import SetPartition, SetPartitions
210-
from .set_partition_ordered import OrderedSetPartition, OrderedSetPartitions
209+
from sage.combinat.set_partition import SetPartition, SetPartitions
210+
from sage.combinat.set_partition_ordered import OrderedSetPartition, OrderedSetPartitions
211211
lazy_import('sage.combinat.multiset_partition_into_sets_ordered',
212212
['OrderedMultisetPartitionIntoSets',
213213
'OrderedMultisetPartitionsIntoSets'])
214-
from .subset import Subsets, subsets, powerset, uniq
215-
from .necklace import Necklaces
214+
from sage.combinat.subset import Subsets, subsets, powerset, uniq
215+
from sage.combinat.necklace import Necklaces
216216
lazy_import('sage.combinat.dyck_word', ('DyckWords', 'DyckWord'))
217217
lazy_import('sage.combinat.nu_dyck_word', ('NuDyckWords', 'NuDyckWord'))
218-
from .sloane_functions import sloane
218+
from sage.combinat.sloane_functions import sloane
219219
lazy_import('sage.combinat.superpartition', ('SuperPartition',
220220
'SuperPartitions'))
221221

222222
lazy_import('sage.combinat.parallelogram_polyomino',
223223
['ParallelogramPolyomino', 'ParallelogramPolyominoes'])
224224

225-
from .root_system.all import *
226-
from .sf.all import *
227-
from .ncsf_qsym.all import *
228-
from .ncsym.all import *
225+
from sage.combinat.root_system.all import *
226+
from sage.combinat.sf.all import *
227+
from sage.combinat.ncsf_qsym.all import *
228+
from sage.combinat.ncsym.all import *
229229
lazy_import('sage.combinat.fqsym', 'FreeQuasisymmetricFunctions')
230-
from .matrices.all import *
230+
from sage.combinat.matrices.all import *
231231
# Posets
232-
from .posets.all import *
232+
from sage.combinat.posets.all import *
233233

234234
# Cluster Algebras and Quivers
235-
from .cluster_algebra_quiver.all import *
235+
from sage.combinat.cluster_algebra_quiver.all import *
236236

237-
from . import ranker
237+
from sage.combinat import ranker
238238

239-
from .integer_vector import IntegerVectors
240-
from .integer_vector_weighted import WeightedIntegerVectors
241-
from .integer_vectors_mod_permgroup import IntegerVectorsModPermutationGroup
239+
from sage.combinat.integer_vector import IntegerVectors
240+
from sage.combinat.integer_vector_weighted import WeightedIntegerVectors
241+
from sage.combinat.integer_vectors_mod_permgroup import IntegerVectorsModPermutationGroup
242242

243243
lazy_import('sage.combinat.q_analogues', ['gaussian_binomial', 'q_binomial', 'number_of_irreducible_polynomials'])
244244

245-
from .species.all import *
245+
from sage.combinat.species.all import *
246246

247247
lazy_import('sage.combinat.kazhdan_lusztig', 'KazhdanLusztigPolynomial')
248248

src/sage/combinat/designs/all.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,15 @@
4343

4444

4545
lazy_import('sage.combinat.designs.incidence_structures', 'IncidenceStructure')
46-
lazy_import('sage.combinat.designs.incidence_structures', 'IncidenceStructure', 'BlockDesign')
46+
lazy_import('sage.combinat.designs.incidence_structures',
47+
'IncidenceStructure', 'BlockDesign')
4748

4849
lazy_import('sage.combinat.designs.incidence_structures',
4950
'IncidenceStructure', as_='Hypergraph')
5051

5152
lazy_import('sage.combinat.designs.covering_design',
5253
['CoveringDesign', 'schonheim', 'trivial_covering_design'])
5354

54-
from . import design_catalog as designs
55+
from sage.combinat.designs import design_catalog as designs
56+
del lazy_import
57+
del install_doc

src/sage/combinat/ncsf_qsym/all.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
from sage.misc.namespace_package import install_doc
1313
install_doc(__package__, __doc__)
1414

15-
from .qsym import QuasiSymmetricFunctions
16-
from .ncsf import NonCommutativeSymmetricFunctions
15+
from sage.combinat.ncsf_qsym.qsym import QuasiSymmetricFunctions
16+
from sage.combinat.ncsf_qsym.ncsf import NonCommutativeSymmetricFunctions

src/sage/combinat/ncsym/all.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
from sage.misc.namespace_package import install_doc
1212
install_doc(__package__, __doc__)
1313

14-
from .ncsym import SymmetricFunctionsNonCommutingVariables
15-
from .dual import SymmetricFunctionsNonCommutingVariablesDual
14+
from sage.combinat.ncsym.ncsym import SymmetricFunctionsNonCommutingVariables
15+
from sage.combinat.ncsym.dual import SymmetricFunctionsNonCommutingVariablesDual

src/sage/combinat/posets/all.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@
3636
from sage.misc.namespace_package import install_doc
3737
install_doc(__package__, __doc__)
3838

39-
from .posets import Poset
39+
from sage.combinat.posets.posets import Poset
4040

41-
from .lattices import LatticePoset, MeetSemilattice, JoinSemilattice
41+
from sage.combinat.posets.lattices import LatticePoset, MeetSemilattice, JoinSemilattice
4242

43-
from .poset_examples import posets, Posets
43+
from sage.combinat.posets.poset_examples import posets, Posets
44+
45+
del install_doc

src/sage/combinat/root_system/all.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,12 @@
121121

122122
from sage.misc.lazy_import import lazy_import
123123

124-
from .cartan_type import CartanType
125-
from .dynkin_diagram import DynkinDiagram
126-
from .cartan_matrix import CartanMatrix
127-
from .coxeter_matrix import CoxeterMatrix
128-
from .coxeter_type import CoxeterType
129-
from .root_system import RootSystem, WeylDim
124+
from sage.combinat.root_system.cartan_type import CartanType
125+
from sage.combinat.root_system.dynkin_diagram import DynkinDiagram
126+
from sage.combinat.root_system.cartan_matrix import CartanMatrix
127+
from sage.combinat.root_system.coxeter_matrix import CoxeterMatrix
128+
from sage.combinat.root_system.coxeter_type import CoxeterType
129+
from sage.combinat.root_system.root_system import RootSystem, WeylDim
130130
lazy_import('sage.combinat.root_system.weyl_group', ['WeylGroup',
131131
'WeylGroupElement'])
132132
lazy_import('sage.combinat.root_system.reflection_group_real',
@@ -136,7 +136,7 @@
136136
lazy_import('sage.combinat.root_system.coxeter_group', 'CoxeterGroup')
137137
lazy_import('sage.combinat.root_system.weyl_characters', ['WeylCharacterRing',
138138
'WeightRing'])
139-
from .branching_rules import BranchingRule, branching_rule_from_plethysm, branching_rule
139+
from sage.combinat.root_system.branching_rules import BranchingRule, branching_rule_from_plethysm, branching_rule
140140

141141
lazy_import('sage.combinat.root_system.non_symmetric_macdonald_polynomials', 'NonSymmetricMacdonaldPolynomials')
142142
lazy_import('sage.combinat.root_system.integrable_representations', 'IntegrableRepresentation')

0 commit comments

Comments
 (0)