Skip to content

Issue #34949: sage.{categories,matrix,structure}: Replace imports from sage.*.all for namespace packages #35012

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 11 commits into from
Feb 24, 2023
Merged

Issue #34949: sage.{categories,matrix,structure}: Replace imports from sage.*.all for namespace packages #35012

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a14d662
sage -fiximports src/sage/{categories,matrix,structure}
alexchandler100 Jan 29, 2023
9911481
src/sage/{categories,matrix,structure}: Manual fixes to imports
alexchandler100 Jan 29, 2023
01cded9
src/sage/structure/element.pyx: Fix up
mkoeppe Jan 30, 2023
6203202
sage.matrix: Consolidate imports from the same module
mkoeppe Jan 30, 2023
b88eb84
Merge remote-tracking branch 'upstream/develop' into t/34949/sage__ca…
mkoeppe Feb 7, 2023
6efb63e
src/sage/structure/element.pyx: Fix placement of # optional tag
mkoeppe Feb 8, 2023
a6b3c65
src/sage/structure/element.pyx: Fix placement of remaining # optional…
mkoeppe Feb 8, 2023
eaffa99
Fix placement of remaining '# optional - sage.misc.cython' tags
mkoeppe Feb 8, 2023
e02e213
src/sage/structure/element.pyx: Restore import of lazy_attribute in c…
mkoeppe Feb 8, 2023
25783a4
Replace relative imports by absolute imports because pytest
mkoeppe Feb 16, 2023
d905cc3
Merge remote-tracking branch 'upstream/develop' into t/34949/sage__ca…
mkoeppe Feb 19, 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
Prev Previous commit
Next Next commit
sage.matrix: Consolidate imports from the same module
  • Loading branch information
Matthias Koeppe committed Jan 30, 2023
commit 62032020ad6f73df11cdce1dbeec51aee35ed7cc
3 changes: 1 addition & 2 deletions src/sage/matrix/matrix_cyclo_dense.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,9 @@ from .matrix_integer_dense cimport _lift_crt
from sage.structure.element cimport Matrix as baseMatrix
from .misc import matrix_integer_dense_rational_reconstruction

from sage.arith.misc import binomial, previous_prime
from sage.rings.rational_field import QQ
from sage.rings.integer_ring import ZZ
from sage.arith.misc import previous_prime
from sage.arith.misc import binomial
from sage.rings.real_mpfr import create_RealNumber as RealNumber
from sage.rings.integer cimport Integer
from sage.rings.rational cimport Rational
Expand Down
9 changes: 4 additions & 5 deletions src/sage/matrix/matrix_integer_dense_hnf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@

from copy import copy

from sage.arith.misc import CRT_list, previous_prime
from sage.misc.misc import cputime
from sage.misc.verbose import verbose
from sage.matrix.constructor import (random_matrix, matrix, identity_matrix)

from sage.rings.integer import Integer
from sage.rings.integer_ring import ZZ
from sage.rings.real_mpfr import RR
from sage.rings.integer import Integer
from sage.arith.misc import previous_prime
from sage.arith.misc import CRT_list

from .constructor import identity_matrix, matrix, random_matrix


def max_det_prime(n):
Expand Down
15 changes: 8 additions & 7 deletions src/sage/matrix/matrix_integer_dense_saturation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@
Saturation over ZZ
"""

from sage.rings.integer_ring import ZZ
from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF
from sage.arith.misc import binomial
from sage.arith.misc import GCD as gcd
from sage.matrix.constructor import identity_matrix, random_matrix
from sage.misc.verbose import verbose
from copy import copy

from sage.arith.misc import binomial, GCD as gcd
from sage.misc.randstate import current_randstate
from sage.misc.verbose import verbose
from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF
from sage.rings.integer_ring import ZZ

from . import matrix_integer_dense_hnf
from copy import copy
from .constructor import identity_matrix, random_matrix


def p_saturation(A, p, proof=True):
Expand Down
37 changes: 15 additions & 22 deletions src/sage/matrix/misc.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,40 +12,33 @@ relevant classes and this file deleted.

from cysignals.signals cimport sig_check

from sage.ext.mod_int cimport *
from sage.libs.gmp.mpz cimport *
from sage.libs.gmp.mpq cimport *
from sage.libs.mpfr cimport *

from sage.libs.flint.fmpz cimport fmpz_set_mpz, fmpz_one
from sage.libs.flint.fmpq cimport fmpq_set_mpq, fmpq_canonicalise
from sage.libs.flint.fmpq_mat cimport fmpq_mat_entry_num, fmpq_mat_entry_den, fmpq_mat_entry
cimport sage.rings.abc

from sage.arith.misc import CRT_basis, previous_prime
from sage.arith.rational_reconstruction cimport mpq_rational_reconstruction

from sage.data_structures.binary_search cimport *
from sage.ext.mod_int cimport *
from sage.libs.flint.fmpq cimport fmpq_set_mpq, fmpq_canonicalise
from sage.libs.flint.fmpq_mat cimport fmpq_mat_entry_num, fmpq_mat_entry_den, fmpq_mat_entry
from sage.libs.flint.fmpz cimport fmpz_set_mpz, fmpz_one
from sage.libs.gmp.mpq cimport *
from sage.libs.gmp.mpz cimport *
from sage.libs.mpfr cimport *
from sage.misc.verbose import get_verbose, verbose
from sage.modules.vector_integer_sparse cimport *
from sage.modules.vector_rational_sparse cimport *
from sage.modules.vector_modn_sparse cimport *
from sage.modules.vector_rational_sparse cimport *
from sage.rings.integer cimport Integer
from sage.rings.integer_ring import ZZ
from sage.rings.rational_field import QQ
from sage.rings.real_mpfr cimport RealNumber

from .matrix0 cimport Matrix
from .matrix_integer_dense cimport Matrix_integer_dense
from .matrix_integer_sparse cimport Matrix_integer_sparse
from .matrix_rational_dense cimport Matrix_rational_dense
from .matrix_rational_sparse cimport Matrix_rational_sparse

from sage.rings.integer_ring import ZZ
from sage.rings.rational_field import QQ

from sage.rings.integer cimport Integer
from sage.arith.misc import previous_prime
from sage.arith.misc import CRT_basis

cimport sage.rings.abc
from sage.rings.real_mpfr cimport RealNumber


from sage.misc.verbose import verbose, get_verbose

def matrix_integer_dense_rational_reconstruction(Matrix_integer_dense A, Integer N):
"""
Expand Down