Skip to content

Commit

Permalink
sagemath: revbump and patch for pari-2.17.0_1
Browse files Browse the repository at this point in the history
  • Loading branch information
tornaria committed Nov 3, 2024
1 parent 1c057b0 commit 5f285c8
Show file tree
Hide file tree
Showing 5 changed files with 2,231 additions and 1 deletion.
89 changes: 89 additions & 0 deletions srcpkgs/sagemath/patches/38749-00-prepare_backport.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
commit 95d7f3070d46c971fe1ea1fceb3cc6d8039c1d66
Author: Gonzalo Tornaría <[email protected]>
Date: Sun Nov 3 13:09:51 2024 -0300

prepare for backport of #38749

diff --git a/src/sage/modular/dirichlet.py b/src/sage/modular/dirichlet.py
index e579c5090e3..efc533c51f0 100644
--- a/src/sage/modular/dirichlet.py
+++ b/src/sage/modular/dirichlet.py
@@ -2388,7 +2388,8 @@ class DirichletGroupFactory(UniqueFactory):

::

- sage: r4 = CyclotomicField(4).ring_of_integers()
+ sage: K = CyclotomicField(4)
+ sage: r4 = K.ring_of_integers()
sage: G = DirichletGroup(60, r4)
sage: G.gens()
(Dirichlet character modulo 60 of conductor 4
@@ -2401,8 +2402,7 @@ class DirichletGroupFactory(UniqueFactory):
zeta4
sage: parent(val)
Gaussian Integers generated by zeta4 in Cyclotomic Field of order 4 and degree 2
- sage: r4_29_0 = r4.residue_field(r4.ideal(29).factor()[0][0]); r4_29_0(val)
- doctest:warning ... DeprecationWarning: ...
+ sage: r4_29_0 = r4.residue_field(K(29).factor()[0][0]); r4_29_0(val)
17
sage: r4_29_0(val) * GF(29)(3)
22
diff --git a/src/sage/rings/number_field/selmer_group.py b/src/sage/rings/number_field/selmer_group.py
index 49b4030b2e9..2a650138291 100644
--- a/src/sage/rings/number_field/selmer_group.py
+++ b/src/sage/rings/number_field/selmer_group.py
@@ -73,7 +73,6 @@ def _ideal_generator(I):
sage: K.<a> = QuadraticField(-11)
sage: [_ideal_generator(K.prime_above(p)) for p in primes(25)]
[2, 1/2*a - 1/2, -1/2*a - 3/2, 7, -a, 13, 17, 19, 1/2*a + 9/2]
-
"""
try:
return I.gens_reduced()[0]
diff --git a/src/sage/schemes/elliptic_curves/gp_simon.py b/src/sage/schemes/elliptic_curves/gp_simon.py
index 39a60361ec6..f258961f685 100644
--- a/src/sage/schemes/elliptic_curves/gp_simon.py
+++ b/src/sage/schemes/elliptic_curves/gp_simon.py
@@ -57,6 +57,9 @@ def simon_two_descent(E, verbose=0, lim1=None, lim3=None, limtriv=None,
sage: import sage.schemes.elliptic_curves.gp_simon
sage: E = EllipticCurve('389a1')
sage: sage.schemes.elliptic_curves.gp_simon.simon_two_descent(E)
+ doctest:warning...:
+ DeprecationWarning: please use the 2-descent algorithm over QQ inside pari
+ See https://github.com/sagemath/sage/issues/38461 for details.
(2, 2, [(5/4 : 5/8 : 1), (-3/4 : 7/8 : 1)])

TESTS::
diff --git a/src/sage/schemes/plane_conics/con_number_field.py b/src/sage/schemes/plane_conics/con_number_field.py
index 393b77bc1ff..af946d05fb7 100644
--- a/src/sage/schemes/plane_conics/con_number_field.py
+++ b/src/sage/schemes/plane_conics/con_number_field.py
@@ -123,9 +123,9 @@ class ProjectiveConic_number_field(ProjectiveConic_field):
sage: C = Conic(K, [1, 3, -5])
sage: C.has_rational_point(point=True, obstruction=True)
(False, Fractional ideal (-i - 2))
- sage: C.has_rational_point(algorithm="rnfisnorm")
+ sage: C.has_rational_point(algorithm='rnfisnorm')
False
- sage: C.has_rational_point(algorithm="rnfisnorm", obstruction=True,
+ sage: C.has_rational_point(algorithm='rnfisnorm', obstruction=True,
....: read_cache=False)
Traceback (most recent call last):
...
diff --git a/src/sage/schemes/projective/projective_morphism.py b/src/sage/schemes/projective/projective_morphism.py
index 339406cd9d6..2baab7e5cda 100644
--- a/src/sage/schemes/projective/projective_morphism.py
+++ b/src/sage/schemes/projective/projective_morphism.py
@@ -1764,10 +1764,10 @@ class SchemeMorphism_polynomial_projective_space_field(SchemeMorphism_polynomial
Scheme morphism:
From: Projective Space of dimension 1 over Number Field in a
with defining polynomial y^4 + 3*y^2 + 1
- with a = 0.?e-151 + 0.618033988749895?*I
+ with a = 0.?e-113 + 0.618033988749895?*I
To: Projective Space of dimension 2 over Number Field in a
with defining polynomial y^4 + 3*y^2 + 1
- with a = 0.?e-151 + 0.618033988749895?*I
+ with a = 0.?e-113 + 0.618033988749895?*I
Defn: Defined on coordinates by sending (x : y) to
(x^2 + (a^3 + 2*a)*x*y + 3*y^2 : y^2 : (2*a^2 + 3)*x*y)

Loading

0 comments on commit 5f285c8

Please sign in to comment.