Skip to content

Commit 34d8cbe

Browse files
author
Release Manager
committed
sagemathgh-39265: Replace `pari.all` imports by direct imports from pari and cypari <!-- ^ 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". --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [ ] The title is concise and informative. - [ ] The description explains in detail what this PR is about. - [ ] 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#39265 Reported by: Tobias Diez Reviewer(s):
2 parents 94ef832 + e846307 commit 34d8cbe

File tree

80 files changed

+122
-101
lines changed

Some content is hidden

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

80 files changed

+122
-101
lines changed

src/sage/arith/misc.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ def norm(v):
265265
raise NotImplementedError("proof and height bound only implemented for real and complex numbers")
266266

267267
else:
268-
from sage.libs.pari.all import pari
268+
from sage.libs.pari import pari
269269
y = pari(z)
270270
f = y.algdep(degree)
271271

@@ -378,7 +378,7 @@ def bernoulli(n, algorithm='default', num_threads=1):
378378
from sage.libs.flint.arith_sage import bernoulli_number as flint_bernoulli
379379
return flint_bernoulli(n)
380380
elif algorithm == 'pari' or algorithm == 'gp':
381-
from sage.libs.pari.all import pari
381+
from sage.libs.pari import pari
382382
x = pari(n).bernfrac() # Use the PARI C library
383383
return Rational(x)
384384
elif algorithm == 'gap':
@@ -470,7 +470,7 @@ def factorial(n, algorithm='gmp'):
470470
if algorithm == 'gmp':
471471
return ZZ(n).factorial()
472472
elif algorithm == 'pari':
473-
from sage.libs.pari.all import pari
473+
from sage.libs.pari import pari
474474
return pari.factorial(n)
475475
else:
476476
raise ValueError('unknown algorithm')
@@ -3165,7 +3165,7 @@ def __call__(self, n):
31653165
return ZZ.zero()
31663166
if n <= 2:
31673167
return ZZ.one()
3168-
from sage.libs.pari.all import pari
3168+
from sage.libs.pari import pari
31693169
return ZZ(pari(n).eulerphi())
31703170

31713171
def plot(self, xmin=1, xmax=50, pointsize=30, rgbcolor=(0, 0, 1),
@@ -4426,7 +4426,7 @@ def primitive_root(n, check=True):
44264426
sage: primitive_root(mpz(-46)) # needs sage.libs.pari
44274427
5
44284428
"""
4429-
from sage.libs.pari.all import pari
4429+
from sage.libs.pari import pari
44304430
if not check:
44314431
return ZZ(pari(n).znprimroot())
44324432
n = ZZ(n).abs()
@@ -4483,7 +4483,7 @@ def nth_prime(n):
44834483
"""
44844484
if n <= 0:
44854485
raise ValueError("nth prime meaningless for nonpositive n (=%s)" % n)
4486-
from sage.libs.pari.all import pari
4486+
from sage.libs.pari import pari
44874487
return ZZ(pari.prime(n))
44884488

44894489

@@ -4601,7 +4601,7 @@ def __call__(self, n):
46014601
# Use fast PARI algorithm
46024602
if n == 0:
46034603
return ZZ.zero()
4604-
from sage.libs.pari.all import pari
4604+
from sage.libs.pari import pari
46054605
return ZZ(pari(n).moebius())
46064606

46074607
def __repr__(self):
@@ -4686,7 +4686,7 @@ def range(self, start, stop=None, step=None):
46864686
return self.range(start, 0, step) + [ZZ.zero()] +\
46874687
self.range(step, stop, step)
46884688

4689-
from sage.libs.pari.all import pari
4689+
from sage.libs.pari import pari
46904690

46914691
if step == 1:
46924692
v = pari('vector(%s, i, moebius(i-1+%s))' % (stop - start, start))
@@ -4816,7 +4816,7 @@ def number_of_divisors(n):
48164816
m = ZZ(n)
48174817
if m.is_zero():
48184818
raise ValueError("input must be nonzero")
4819-
from sage.libs.pari.all import pari
4819+
from sage.libs.pari import pari
48204820
return ZZ(pari(m).numdiv())
48214821

48224822

@@ -4889,7 +4889,7 @@ def hilbert_symbol(a, b, p, algorithm='pari'):
48894889
if algorithm == "pari":
48904890
if p == -1:
48914891
p = 0
4892-
from sage.libs.pari.all import pari
4892+
from sage.libs.pari import pari
48934893
return ZZ(pari(a).hilbert(b, p))
48944894

48954895
elif algorithm == 'direct':

src/sage/combinat/combinat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
from sage.structure.element import Element
185185

186186
lazy_import('sage.interfaces.maxima_lib', 'maxima')
187-
lazy_import('sage.libs.pari.all', 'pari')
187+
lazy_import('sage.libs.pari', 'pari')
188188
lazy_import('sage.misc.prandom', 'randint')
189189

190190

src/sage/combinat/partition.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@
317317
lazy_import('sage.combinat.skew_partition', 'SkewPartition')
318318
lazy_import('sage.combinat.partition_tuple', 'PartitionTuple')
319319
lazy_import('sage.combinat.root_system.weyl_group', 'WeylGroup')
320-
lazy_import('sage.libs.pari.all', 'pari')
320+
lazy_import('sage.libs.pari', 'pari')
321321
lazy_import('sage.groups.perm_gps.permgroup', 'PermutationGroup')
322322
lazy_import("sage.symbolic.ring", "var")
323323

src/sage/combinat/partition_tuple.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ class of modules for the algebras, which are generalisations of the Specht
275275
from sage.structure.unique_representation import UniqueRepresentation
276276

277277
lazy_import('sage.groups.perm_gps.permgroup', 'PermutationGroup')
278-
lazy_import('sage.libs.pari.all', 'pari')
278+
lazy_import('sage.libs.pari', 'pari')
279279

280280
# -------------------------------------------------
281281
# Partition tuple - element class

src/sage/combinat/sloane_functions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6796,7 +6796,7 @@ def _powerful_numbers_in_range(self, n, m):
67966796

67976797
n = max(n, 4)
67986798
# Use PARI directly -- much faster.
6799-
from sage.libs.pari.all import pari
6799+
from sage.libs.pari import pari
68006800
L = pari('v=listcreate(); for(i=%s,%s,if(vecmin(factor(i)[,2])>1,listput(v,i))); v' % (n, m))
68016801
return [ZZ(x) for x in L] # not very many, so not much overhead
68026802

src/sage/databases/cremona.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ def cremona_to_lmfdb(cremona_label, CDB=None):
559559
sage: for label in ['438.c2','306.b','462.f3']:
560560
....: assert(cremona_to_lmfdb(lmfdb_to_cremona(label)) == label)
561561
"""
562-
from sage.libs.pari.all import pari
562+
from sage.libs.pari import pari
563563
m = cremona_label_regex.match(cremona_label)
564564
if m is None:
565565
raise ValueError("Invalid Cremona label")
@@ -609,7 +609,7 @@ def lmfdb_to_cremona(lmfdb_label, CDB=None):
609609
sage: cremona_to_lmfdb('990j1')
610610
'990.h3'
611611
"""
612-
from sage.libs.pari.all import pari
612+
from sage.libs.pari import pari
613613
m = lmfdb_label_regex.match(lmfdb_label)
614614
if m is None:
615615
raise ValueError("Invalid LMFDB label")

src/sage/dynamics/arithmetic_dynamics/projective_ds.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class initialization directly.
116116
lazy_import('sage.rings.padics.factory', 'Qp')
117117
lazy_import('sage.rings.qqbar', 'number_field_elements_from_algebraics')
118118

119-
from sage.libs.pari.all import PariError
119+
from cypari2.handle_error import PariError
120120

121121

122122
class DynamicalSystem_projective(SchemeMorphism_polynomial_projective_space,

src/sage/functions/special.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ def elliptic_j(z, prec=53):
458458
z = CC(z)
459459
except ValueError:
460460
raise ValueError("elliptic_j only defined for complex arguments.")
461-
from sage.libs.pari.all import pari
461+
from sage.libs.pari import pari
462462
return CC(pari(z).ellj())
463463

464464

src/sage/groups/perm_gps/constructor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
lazy_import('sage.combinat.permutation', ['Permutation', 'from_cycles'])
2929

3030
try:
31-
from sage.libs.pari.all import pari_gen
31+
from cypari2.gen import Gen as pari_gen
3232
except ImportError:
3333
pari_gen = ()
3434

src/sage/interfaces/genus2reduction.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
from sage.rings.integer_ring import ZZ
3737
from sage.rings.rational_field import QQ
3838
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
39-
from sage.libs.pari.all import pari
39+
from sage.libs.pari import pari
4040

4141
roman_numeral = ["", "I", "II", "III", "IV", "V", "VI", "VII"]
4242

0 commit comments

Comments
 (0)