`sage.{dynamics,schemes}`: Modularization fixes, docstring cosmetics, update `# needs` #36271

mkoeppe · 2023-09-16T01:33:20Z

📝 Checklist

The title is concise, informative, and self-explanatory.
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 accordingly.

⌛ Dependencies

…tics, add # needs

…ings.abc

dcoudert · 2023-09-30T10:53:17Z

src/sage/dynamics/arithmetic_dynamics/berkovich_ds.py

-            sage: B = Berkovich_Cp_Projective(P, ideal)
-            sage: f = DynamicalSystem_Berkovich([x^2 + y^2, 2*x*y], B)
-            sage: f.scale_by(2); f
+            sage: A.<a> = NumberField(z^3 + 20)                                         # needs sage.rings.number_field


block scope

Thanks. I've redone this file in e38afeb with a file tag for "sage.rings.padics" and block tags for "sage.rings.number_field"

src/sage/dynamics/arithmetic_dynamics/berkovich_ds.py

src/sage/dynamics/arithmetic_dynamics/projective_ds.py

dcoudert · 2023-09-30T11:21:40Z

src/sage/dynamics/arithmetic_dynamics/projective_ds.py

            [(1 : 1), (4/3 : 1), (1 : 0), (0 : 1)]

        ::

-            sage: K.<v> = QuadraticField(2)
-            sage: P.<x,y> = ProjectiveSpace(K,1)
+            sage: K.<v> = QuadraticField(2)                                             # needs sage.rings.number_field


block scope (and many other places in this file)

Done in 8443583

dcoudert · 2023-09-30T11:23:46Z

src/sage/dynamics/arithmetic_dynamics/wehlerK3.py

@@ -330,17 +335,17 @@ def Gpoly(self, component, k):
        Return the G polynomials  `G^*_k`.

        They are defined as:
-        `G^*_k = \left(L^*_j\right)^2Q^*_{ii}-L^*_iL^*_jQ^*_{ij}+\left(L^*_i\right)^2Q^*_{jj}`\
+        `G^*_k = \left(L^*_j\right)^2Q^*_{ii}-L^*_iL^*_jQ^*_{ij}+\left(L^*_i\right)^2Q^*_{jj}`
        where {i, j, k} is some permutation of (0, 1, 2) and * is either


math mode ?

Done in 869d776

dcoudert · 2023-09-30T11:28:09Z

src/sage/dynamics/arithmetic_dynamics/wehlerK3.py

@@ -905,11 +913,11 @@ def degenerate_primes(self,check=True):
            [2, 3, 5, 11, 23, 47, 48747691, 111301831]
        """
        PP = self.ambient_space()
-        if PP.base_ring() in _NumberFields or is_NumberFieldOrder(PP.base_ring()):
-            if PP.base_ring() != ZZ and PP.base_ring() != QQ:
+        if PP.base_ring() != ZZ and PP.base_ring() != QQ:


I'm not sure of that this change is correct. You changed the order of the tests but not of the error messages...

Thanks, I've rephrased it in 869d776

dcoudert · 2023-09-30T11:32:46Z

src/sage/schemes/hyperelliptic_curves/monsky_washnitzer.py

@@ -717,25 +722,25 @@ def helper_matrix(Q):

 def lift(x):
    r"""
-    Try to call x.lift(), presumably from the `p`-adics to ZZ.
+    Try to call ``x.lift()``, presumably from the `p`-adics to ``ZZ``.


In other places you used \ZZ, but both are ok I think.

I've changed it, as part of 1b873b9

…lock tags

…ck tags

…ges, docstring cosmetics

… cosmetics

dcoudert · 2023-10-02T09:21:19Z

The CI reports the following error

  /sage/src/sage/dynamics/arithmetic_dynamics/projective_ds.py:1741:20 - error: "tuple[Type[TypeError], Unknown | tuple[()]]" is not valid exception class

However, I can compile without error on my laptop.

SageMath version 10.2.beta8, Release Date: 2023-10-21

github-actions · 2023-10-21T21:00:51Z

Documentation preview for this PR (built with commit 7033d7d; changes) is ready! 🎉

dcoudert

all tests pass on my macOS laptop. LGTM.

mkoeppe · 2023-10-22T18:08:46Z

Thank you!

…cstring cosmetics, update `# needs`     - Part of: sagemath#29705 - Cherry-picked from: sagemath#35095  ### 📝 Checklist     - [x] The title is concise, informative, and self-explanatory. - [ ] 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 accordingly. ### ⌛ Dependencies   URL: sagemath#36271 Reported by: Matthias Köppe Reviewer(s): David Coudert, Matthias Köppe

tobiasdiez · 2023-11-01T01:57:54Z

Pyright check fails because of this PR.

dcoudert · 2023-11-02T13:05:43Z

Do we have any indication of what's going on / the localisation of the problem ?

dcoudert · 2023-11-02T13:13:03Z

I see, it's this change in src/sage/dynamics/arithmetic_dynamics/projective_ds.py

try:
    from sage.libs.pari.all import PariError
except ImportError:
    PariError = ()

that makes Pyright unhappy with

            try:
                res = (f.lc() ** (d - g.degree()) * g.lc() ** (d - f.degree())
                       * f.__pari__().polresultant(g, x))
                return self.domain().base_ring()(res)
            except (TypeError, PariError):
                pass

What should be the correct default value for PariError ?

mkoeppe added c: algebraic geometry t: refactoring labels Sep 16, 2023

mkoeppe self-assigned this Sep 16, 2023

mkoeppe changed the title ~~sage.{dynamics,schemes}: Update # needs~~ sage.{dynamics,schemes}: Modularization fixes, docstring cosmetics, update # needs Sep 16, 2023

mkoeppe added 19 commits September 16, 2023 11:39

sage.schemes: Update # needs

5257002

Fix # needs for sagemath-pari

26bda85

sage.schemes: Update # needs

796265f

src/sage/dynamics/complex_dynamics/mandel_julia.py: Use lazy_import

75b8262

sage.schemes: Doctest cosmetics, update # needs

0284add

src/sage/schemes/hyperelliptic_curves/hypellfrob.pyx: Docstring cosme…

d962ea5

…tics, add # needs

sage.schemes.projective: Add # needs

420ca2b

sage.dynamics: Doctest cosmetics

1391f91

Massive modularization fixes

6e08d6f

sage.dynamics.arithmetic_dynamics: Modularization fixes for imports

230b734

Update # optional / # needs

0d6869a

Fix up imports

565663e

src/sage/dynamics: sage -fixdoctests --only-tags

53e8a00

src/sage/dynamics/complex_dynamics/mandel_julia_helper.pyx: Add # needs

d41ca2a

sage.dynamics: Add # needs

a7ad632

sage.schemes: Update # needs

a0379b5

sage.schemes: Update # needs

92489a4

sage.schemes: Update # needs

c3b7079

sage.schemes: Update # needs

d8141b2

mkoeppe force-pushed the needs_for_sage_schemes_sage_dynamics branch from 37d1671 to d8141b2 Compare September 16, 2023 18:39

mkoeppe mentioned this pull request Sep 21, 2023

Update Cython to 3.0.2 #36110

Merged

3 tasks

mkoeppe added 5 commits September 23, 2023 13:23

projective_morphism.py, projective_ds.py: Test for QQbar using sage.r…

3538ede

…ings.abc

sage.schemes: Modularization fixes

3e74476

sage.schemes: Modularization fixes for imports

23fecb1

sage.schemes, sage.dynamics.arithmetic_dynamics: Modularization fixes

67b279f

sage.{rings,schemes}: Simplify some tests for number fields

dce871a

mkoeppe added 2 commits September 24, 2023 14:09

sage.schemes: Update # needs

b39df39

sage.schemes: Update # needs

a1195b0

dcoudert suggested changes Sep 30, 2023

View reviewed changes

mkoeppe added 5 commits October 1, 2023 09:52

src/sage/dynamics/arithmetic_dynamics/berkovich_ds.py: Use file and b…

e38afeb

…lock tags

src/sage/dynamics/arithmetic_dynamics/projective_ds.py: Many more blo…

8443583

…ck tags

src/sage/dynamics/arithmetic_dynamics/wehlerK3.py: update error messa…

869d776

…ges, docstring cosmetics

src/sage/schemes/hyperelliptic_curves/monsky_washnitzer.py: Docstring…

1b873b9

… cosmetics

src/sage/dynamics/arithmetic_dynamics/projective_ds.py: Fixup

ba0a3d7

mkoeppe added 2 commits October 8, 2023 10:39

Merge branch 'develop' into needs_for_sage_schemes_sage_dynamics

871c390

Merge tag '10.2.beta8' into needs_for_sage_schemes_sage_dynamics

7033d7d

SageMath version 10.2.beta8, Release Date: 2023-10-21

dcoudert approved these changes Oct 22, 2023

View reviewed changes

dcoudert added s: positive review and removed s: needs review labels Oct 22, 2023

vbraun merged commit 6afeae8 into sagemath:develop Oct 31, 2023
18 of 26 checks passed

github-actions bot removed the s: positive review label Oct 31, 2023

mkoeppe added this to the sage-10.2 milestone Oct 31, 2023

tobiasdiez mentioned this pull request Nov 3, 2023

fix broken pyright in CI #36639

Merged

2 tasks

mkoeppe mentioned this pull request Nov 4, 2023

Meta-ticket: Modularize sagelib into separate distributions (pip-installable packages) sagemath-... for Sage 10.x #29705

Open

mkoeppe deleted the needs_for_sage_schemes_sage_dynamics branch December 23, 2023 21:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`sage.{dynamics,schemes}`: Modularization fixes, docstring cosmetics, update `# needs` #36271

`sage.{dynamics,schemes}`: Modularization fixes, docstring cosmetics, update `# needs` #36271

mkoeppe commented Sep 16, 2023

dcoudert Sep 30, 2023

mkoeppe Oct 1, 2023 •

edited

dcoudert Sep 30, 2023

mkoeppe Oct 1, 2023

dcoudert Sep 30, 2023

mkoeppe Oct 1, 2023

dcoudert Sep 30, 2023

mkoeppe Oct 1, 2023

dcoudert Sep 30, 2023

mkoeppe Oct 1, 2023

dcoudert commented Oct 2, 2023

github-actions bot commented Oct 21, 2023

dcoudert left a comment

mkoeppe commented Oct 22, 2023

tobiasdiez commented Nov 1, 2023

dcoudert commented Nov 2, 2023

dcoudert commented Nov 2, 2023

sage.{dynamics,schemes}: Modularization fixes, docstring cosmetics, update # needs #36271

sage.{dynamics,schemes}: Modularization fixes, docstring cosmetics, update # needs #36271

Conversation

mkoeppe commented Sep 16, 2023

📝 Checklist

⌛ Dependencies

Choose a reason for hiding this comment

mkoeppe Oct 1, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dcoudert commented Oct 2, 2023

github-actions bot commented Oct 21, 2023

dcoudert left a comment

Choose a reason for hiding this comment

mkoeppe commented Oct 22, 2023

tobiasdiez commented Nov 1, 2023

dcoudert commented Nov 2, 2023

dcoudert commented Nov 2, 2023

`sage.{dynamics,schemes}`: Modularization fixes, docstring cosmetics, update `# needs` #36271

`sage.{dynamics,schemes}`: Modularization fixes, docstring cosmetics, update `# needs` #36271

mkoeppe Oct 1, 2023 •

edited