passagemath-setup 10.4.29__tar.gz → 10.4.31__tar.gz

{passagemath_setup-10.4.29 → passagemath_setup-10.4.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: passagemath-setup
-Version: 10.4.29
+Version: 10.4.31
 Summary: passagemath: Build system of the Sage library
 Author-email: The Sage Developers <sage-support@googlegroups.com>
 License: GNU General Public License (GPL) v2 or later

passagemath_setup-10.4.31/VERSION.txt

@@ -0,0 +1 @@
+10.4.31

{passagemath_setup-10.4.29 → passagemath_setup-10.4.31}/passagemath_setup.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: passagemath-setup
-Version: 10.4.29
+Version: 10.4.31
 Summary: passagemath: Build system of the Sage library
 Author-email: The Sage Developers <sage-support@googlegroups.com>
 License: GNU General Public License (GPL) v2 or later

{passagemath_setup-10.4.29 → passagemath_setup-10.4.31}/passagemath_setup.egg-info/SOURCES.txt

@@ -40,21 +40,21 @@ sage_setup/autogen/flint/macros/mag_macros.pxd
 sage_setup/autogen/flint/templates/flint_sage.pyx.template
 sage_setup/autogen/flint/templates/flint_wrap.h.template
 sage_setup/autogen/flint/templates/types.pxd.template
-sage_setup/autogen/interpreters/__init__.py
 sage_setup/autogen/interpreters/__main__.py
-sage_setup/autogen/interpreters/generator.py
-sage_setup/autogen/interpreters/instructions.py
-sage_setup/autogen/interpreters/memory.py
-sage_setup/autogen/interpreters/storage.py
-sage_setup/autogen/interpreters/utils.py
-sage_setup/autogen/interpreters/specs/__init__.py
-sage_setup/autogen/interpreters/specs/base.py
-sage_setup/autogen/interpreters/specs/cc.py
-sage_setup/autogen/interpreters/specs/cdf.py
-sage_setup/autogen/interpreters/specs/element.py
-sage_setup/autogen/interpreters/specs/python.py
-sage_setup/autogen/interpreters/specs/rdf.py
-sage_setup/autogen/interpreters/specs/rr.py
+sage_setup/autogen/interpreters/internal/__init__.py
+sage_setup/autogen/interpreters/internal/generator.py
+sage_setup/autogen/interpreters/internal/instructions.py
+sage_setup/autogen/interpreters/internal/memory.py
+sage_setup/autogen/interpreters/internal/storage.py
+sage_setup/autogen/interpreters/internal/utils.py
+sage_setup/autogen/interpreters/internal/specs/__init__.py
+sage_setup/autogen/interpreters/internal/specs/base.py
+sage_setup/autogen/interpreters/internal/specs/cc.py
+sage_setup/autogen/interpreters/internal/specs/cdf.py
+sage_setup/autogen/interpreters/internal/specs/element.py
+sage_setup/autogen/interpreters/internal/specs/python.py
+sage_setup/autogen/interpreters/internal/specs/rdf.py
+sage_setup/autogen/interpreters/internal/specs/rr.py
 sage_setup/command/__init__.py
 sage_setup/command/sage_build_cython.py
 sage_setup/command/sage_build_ext.py

{passagemath_setup-10.4.29 → passagemath_setup-10.4.31}/pyproject.toml

@@ -39,7 +39,8 @@ packages = [
     "sage_setup",
     "sage_setup.autogen",
     "sage_setup.autogen.interpreters",
-    "sage_setup.autogen.interpreters.specs",
+    "sage_setup.autogen.interpreters.internal",
+    "sage_setup.autogen.interpreters.internal.specs",
     "sage_setup.command",
 ]
 include-package-data = false

{passagemath_setup-10.4.29 → passagemath_setup-10.4.31}/sage_setup/__init__.py

@@ -1,6 +1,7 @@
 def sage_setup(distributions, *,
                interpreters=(),
                required_modules=(), optional_modules=(),
+               spkgs=(),
                recurse_packages=(),
                package_data=None):
     r"""
@@ -17,6 +18,8 @@ def sage_setup(distributions, *,
 
     - ``optional_modules`` -- sequence of strings, pkgconfig modules to checked for the build.
 
+    - ``spkgs`` -- sequence of strings, SPKGs required for the build.
+
     - ``package_data`` -- ``None`` or a dictionary mapping package names to lists of filename
       glob patterns, the package data to install.
 
@@ -68,13 +71,6 @@ def sage_setup(distributions, *,
     from sage_setup.excepthook import excepthook
     sys.excepthook = excepthook
 
-    from sage_setup.setenv import setenv
-    setenv()
-
-    import sage.env
-    sage.env.default_required_modules = required_modules
-    sage.env.default_optional_modules = optional_modules
-
     cmdclass = dict(build_ext=sage_build_ext_minimal,
                     build_py=sage_build_py)
 
@@ -88,11 +84,27 @@ def sage_setup(distributions, *,
         python_modules = []
         python_packages = []
     else:
+
+        if spkgs:
+            try:
+                from sage_conf import make
+            except ImportError:
+                pass
+            else:
+                make(" ".join(f"{spkg}-ensure" for spkg in spkgs))
+
+        from sage_setup.setenv import setenv
+        setenv()
+
+        import sage.env
+        sage.env.default_required_modules = required_modules
+        sage.env.default_optional_modules = optional_modules
+
         if interpreters:
             log.info("Generating auto-generated sources")
             # from sage_setup.autogen import autogen_all
             # autogen_all()
-            from sage_setup.autogen.interpreters import rebuild
+            from sage_setup.autogen.interpreters.internal import rebuild
             rebuild(os.path.join("sage", "ext", "interpreters"),
                     interpreters=interpreters,
                     distribution=distributions[0], force=True)

{passagemath_setup-10.4.29 → passagemath_setup-10.4.31}/sage_setup/autogen/__init__.py

@@ -1,6 +1,6 @@
 import os
 
-from . import interpreters
+from sage_setup.autogen.interpreters.internal import rebuild
 
 
 def autogen_all():
@@ -11,6 +11,7 @@ def autogen_all():
     of packages built/installed by setup.py.
     """
     from sage.env import SAGE_SRC
-    interpreters.rebuild(os.path.join(SAGE_SRC, "sage", "ext", "interpreters"))
 
-    return ['sage.ext.interpreters']
+    rebuild(os.path.join(SAGE_SRC, "sage", "ext", "interpreters"))
+
+    return ["sage.ext.interpreters"]

{passagemath_setup-10.4.29 → passagemath_setup-10.4.31}/sage_setup/autogen/interpreters/__main__.py

@@ -1,8 +1,9 @@
+#!/usr/bin/env python3
 # Usage: python -m sage_setup.autogen.interpreters <output_dir>
 
 import argparse
 
-from . import rebuild
+from internal import rebuild
 
 parser = argparse.ArgumentParser()
 parser.add_argument("output_dir", help="Output directory")

{passagemath_setup-10.4.29/sage_setup/autogen/interpreters → passagemath_setup-10.4.31/sage_setup/autogen/interpreters/internal}/__init__.py

@@ -109,20 +109,18 @@ compatibility.
 # that will have to be changed.
 #####################################################################
 
-from __future__ import print_function, absolute_import
+from __future__ import absolute_import, print_function
 
 import os
-
 from os.path import getmtime
 
-from .generator import InterpreterGenerator, AUTOGEN_WARN
+from .generator import AUTOGEN_WARN, InterpreterGenerator
 from .instructions import *
 from .memory import *
 from .specs.base import *
 from .storage import *
 from .utils import *
 
-
 # Tuple of (filename_root, extension, method) where filename_root is the
 # root of the filename to be joined with "_<interpreter_name>".ext and
 # method is the name of a get_ method on InterpreterGenerator that returns
@@ -141,8 +139,8 @@ def build_interp(interp_spec, dir, distribution=None):
 
     EXAMPLES::
 
-        sage: from sage_setup.autogen.interpreters import *
-        sage: from sage_setup.autogen.interpreters.specs.rdf import RDFInterpreter
+        sage: from sage_setup.autogen.interpreters.internal import *
+        sage: from sage_setup.autogen.interpreters.internal.specs.rdf import RDFInterpreter
         sage: testdir = tmp_dir()
         sage: rdf_interp = RDFInterpreter()
         sage: build_interp(rdf_interp, testdir)
@@ -189,10 +187,10 @@ def rebuild(dirname, force=False, interpreters=None, distribution=None):
 
     Monolithic build::
 
-        sage: from sage_setup.autogen.interpreters import *
+        sage: from sage_setup.autogen.interpreters.internal import *
         sage: testdir = tmp_dir()
         sage: rebuild(testdir)
-        Building interpreters for fast_callable
+        Generating interpreters for fast_callable in ...
         -> First build of interpreters
         sage: with open(testdir + '/wrapper_el.pyx') as f:
         ....:     f.readline()
@@ -203,7 +201,7 @@ def rebuild(dirname, force=False, interpreters=None, distribution=None):
         sage: testdir = tmp_dir()
         sage: rebuild(testdir, interpreters=['Element', 'Python'],
         ....:         distribution='sagemath-categories')
-        Building interpreters for fast_callable
+        Generating interpreters for fast_callable in ...
         -> First build of interpreters
         sage: with open(testdir + '/all__sagemath_categories.py') as f:
         ....:     f.readline()
@@ -211,16 +209,22 @@ def rebuild(dirname, force=False, interpreters=None, distribution=None):
     """
     # This line will show up in "sage -b" (once per upgrade, not every time
     # you run it).
-    print("Building interpreters for fast_callable")
+    print(f"Generating interpreters for fast_callable in {dirname}")
 
     if interpreters is None:
         interpreters = ['CDF', 'Element', 'Python', 'RDF', 'RR', 'CC']
 
     from importlib import import_module
 
-    _INTERPRETERS = [getattr(import_module('sage_setup.autogen.interpreters.specs.' + interpreter.lower()),
-                             interpreter + 'Interpreter')
-                     for interpreter in interpreters]
+    _INTERPRETERS = [
+        getattr(
+            import_module(
+                ".specs." + interpreter.lower(), package=__name__
+            ),
+            interpreter + "Interpreter",
+        )
+        for interpreter in interpreters
+    ]
 
     if distribution is None:
         all_py = 'all.py'
@@ -232,11 +236,6 @@ def rebuild(dirname, force=False, interpreters=None, distribution=None):
     except OSError:
         if not os.path.isdir(dirname):
             raise
-        # Remove leftover file from before move to namespace packages
-        try:
-            os.remove(os.path.join(dirname, '__init__.py'))
-        except FileNotFoundError:
-            pass
 
     # Although multiple files are generated by this function, since
     # they are all generated at once it suffices to make sure if just
@@ -272,3 +271,6 @@ def rebuild(dirname, force=False, interpreters=None, distribution=None):
         if distribution is not None:
             f.write(f"# sage_setup: distribution = {distribution}\n")
         f.write("# " + AUTOGEN_WARN)
+
+    with open(os.path.join(dirname, '__init__.py'), 'w') as f:
+        f.write("# " + AUTOGEN_WARN)

{passagemath_setup-10.4.29/sage_setup/autogen/interpreters → passagemath_setup-10.4.31/sage_setup/autogen/interpreters/internal}/generator.py

@@ -42,8 +42,8 @@ class InterpreterGenerator(object):
 
         EXAMPLES::
 
-            sage: from sage_setup.autogen.interpreters import *
-            sage: from sage_setup.autogen.interpreters.specs.rdf import RDFInterpreter
+            sage: from sage_setup.autogen.interpreters.internal import *
+            sage: from sage_setup.autogen.interpreters.internal.specs.rdf import RDFInterpreter
             sage: interp = RDFInterpreter()
             sage: gen = InterpreterGenerator(interp)
             sage: gen._spec is interp
@@ -72,8 +72,8 @@ class InterpreterGenerator(object):
 
         EXAMPLES::
 
-            sage: from sage_setup.autogen.interpreters import *
-            sage: from sage_setup.autogen.interpreters.specs.rdf import RDFInterpreter
+            sage: from sage_setup.autogen.interpreters.internal import *
+            sage: from sage_setup.autogen.interpreters.internal.specs.rdf import RDFInterpreter
             sage: interp = RDFInterpreter()
             sage: gen = InterpreterGenerator(interp)
             sage: from io import StringIO
@@ -219,8 +219,8 @@ class InterpreterGenerator(object):
 
         EXAMPLES::
 
-            sage: from sage_setup.autogen.interpreters import *
-            sage: from sage_setup.autogen.interpreters.specs.element import ElementInterpreter
+            sage: from sage_setup.autogen.interpreters.internal import *
+            sage: from sage_setup.autogen.interpreters.internal.specs.element import ElementInterpreter
             sage: interp = ElementInterpreter()
             sage: gen = InterpreterGenerator(interp)
             sage: print(gen.func_header())
@@ -262,8 +262,8 @@ class InterpreterGenerator(object):
 
         EXAMPLES::
 
-            sage: from sage_setup.autogen.interpreters import *
-            sage: from sage_setup.autogen.interpreters.specs.rdf import RDFInterpreter
+            sage: from sage_setup.autogen.interpreters.internal import *
+            sage: from sage_setup.autogen.interpreters.internal.specs.rdf import RDFInterpreter
             sage: interp = RDFInterpreter()
             sage: gen = InterpreterGenerator(interp)
             sage: from io import StringIO
@@ -310,8 +310,8 @@ class InterpreterGenerator(object):
 
         EXAMPLES::
 
-            sage: from sage_setup.autogen.interpreters import *
-            sage: from sage_setup.autogen.interpreters.specs.rdf import RDFInterpreter
+            sage: from sage_setup.autogen.interpreters.internal import *
+            sage: from sage_setup.autogen.interpreters.internal.specs.rdf import RDFInterpreter
             sage: interp = RDFInterpreter()
             sage: gen = InterpreterGenerator(interp)
             sage: from io import StringIO
@@ -480,8 +480,8 @@ class InterpreterGenerator(object):
 
         EXAMPLES::
 
-            sage: from sage_setup.autogen.interpreters import *
-            sage: from sage_setup.autogen.interpreters.specs.rdf import RDFInterpreter
+            sage: from sage_setup.autogen.interpreters.internal import *
+            sage: from sage_setup.autogen.interpreters.internal.specs.rdf import RDFInterpreter
             sage: interp = RDFInterpreter()
             sage: gen = InterpreterGenerator(interp)
             sage: from io import StringIO
@@ -532,10 +532,10 @@ class InterpreterGenerator(object):
 
         First we get the InterpreterSpec for several interpreters::
 
-            sage: from sage_setup.autogen.interpreters import *
-            sage: from sage_setup.autogen.interpreters.specs.rdf import RDFInterpreter
-            sage: from sage_setup.autogen.interpreters.specs.rr import RRInterpreter
-            sage: from sage_setup.autogen.interpreters.specs.element import ElementInterpreter
+            sage: from sage_setup.autogen.interpreters.internal import *
+            sage: from sage_setup.autogen.interpreters.internal.specs.rdf import RDFInterpreter
+            sage: from sage_setup.autogen.interpreters.internal.specs.rr import RRInterpreter
+            sage: from sage_setup.autogen.interpreters.internal.specs.element import ElementInterpreter
             sage: rdf_spec = RDFInterpreter()
             sage: rr_spec = RRInterpreter()
             sage: el_spec = ElementInterpreter()
@@ -657,10 +657,10 @@ class InterpreterGenerator(object):
 
         First we get the InterpreterSpec for several interpreters::
 
-            sage: from sage_setup.autogen.interpreters import *
-            sage: from sage_setup.autogen.interpreters.specs.rdf import RDFInterpreter
-            sage: from sage_setup.autogen.interpreters.specs.rr import RRInterpreter
-            sage: from sage_setup.autogen.interpreters.specs.element import ElementInterpreter
+            sage: from sage_setup.autogen.interpreters.internal import *
+            sage: from sage_setup.autogen.interpreters.internal.specs.rdf import RDFInterpreter
+            sage: from sage_setup.autogen.interpreters.internal.specs.rr import RRInterpreter
+            sage: from sage_setup.autogen.interpreters.internal.specs.element import ElementInterpreter
             sage: rdf_spec = RDFInterpreter()
             sage: rr_spec = RRInterpreter()
             sage: el_spec = ElementInterpreter()
@@ -983,10 +983,10 @@ class InterpreterGenerator(object):
 
         First we get the InterpreterSpec for several interpreters::
 
-            sage: from sage_setup.autogen.interpreters import *
-            sage: from sage_setup.autogen.interpreters.specs.rdf import RDFInterpreter
-            sage: from sage_setup.autogen.interpreters.specs.rr import RRInterpreter
-            sage: from sage_setup.autogen.interpreters.specs.element import ElementInterpreter
+            sage: from sage_setup.autogen.interpreters.internal import *
+            sage: from sage_setup.autogen.interpreters.internal.specs.rdf import RDFInterpreter
+            sage: from sage_setup.autogen.interpreters.internal.specs.rr import RRInterpreter
+            sage: from sage_setup.autogen.interpreters.internal.specs.element import ElementInterpreter
             sage: rdf_spec = RDFInterpreter()
             sage: rr_spec = RRInterpreter()
             sage: el_spec = ElementInterpreter()

{passagemath_setup-10.4.29/sage_setup/autogen/interpreters → passagemath_setup-10.4.31/sage_setup/autogen/interpreters/internal}/instructions.py

@@ -56,7 +56,7 @@ def params_gen(**chunks):
 
     EXAMPLES::
 
-        sage: from sage_setup.autogen.interpreters import *
+        sage: from sage_setup.autogen.interpreters.internal import *
         sage: mc_stack = MemoryChunkScratch('stack', ty_double, is_stack=True)
         sage: mc_args = MemoryChunkArguments('args', ty_double)
         sage: mc_code = MemoryChunkConstants('code', ty_int)
@@ -186,8 +186,8 @@ class InstrSpec(object):
 
     EXAMPLES::
 
-        sage: from sage_setup.autogen.interpreters import *
-        sage: from sage_setup.autogen.interpreters.specs.rdf import RDFInterpreter
+        sage: from sage_setup.autogen.interpreters.internal import *
+        sage: from sage_setup.autogen.interpreters.internal.specs.rdf import RDFInterpreter
         sage: pg = RDFInterpreter().pg
         sage: InstrSpec('add', pg('SS','S'), code='o0 = i0+i1;')
         add: SS->S = 'o0 = i0+i1;'
@@ -213,8 +213,8 @@ class InstrSpec(object):
 
         EXAMPLES::
 
-            sage: from sage_setup.autogen.interpreters import *
-            sage: from sage_setup.autogen.interpreters.specs.rdf import RDFInterpreter
+            sage: from sage_setup.autogen.interpreters.internal import *
+            sage: from sage_setup.autogen.interpreters.internal.specs.rdf import RDFInterpreter
             sage: pg = RDFInterpreter().pg
             sage: InstrSpec('add', pg('SS','S'), code='o0 = i0+i1;')
             add: SS->S = 'o0 = i0+i1;'
@@ -288,8 +288,8 @@ class InstrSpec(object):
 
         EXAMPLES::
 
-            sage: from sage_setup.autogen.interpreters import *
-            sage: from sage_setup.autogen.interpreters.specs.rdf import RDFInterpreter
+            sage: from sage_setup.autogen.interpreters.internal import *
+            sage: from sage_setup.autogen.interpreters.internal.specs.rdf import RDFInterpreter
             sage: pg = RDFInterpreter().pg
             sage: InstrSpec('add', pg('SS','S'), code='o0 = i0+i1;')
             add: SS->S = 'o0 = i0+i1;'
@@ -311,8 +311,8 @@ def instr_infix(name, io, op):
 
     EXAMPLES::
 
-        sage: from sage_setup.autogen.interpreters import *
-        sage: from sage_setup.autogen.interpreters.specs.rdf import RDFInterpreter
+        sage: from sage_setup.autogen.interpreters.internal import *
+        sage: from sage_setup.autogen.interpreters.internal.specs.rdf import RDFInterpreter
         sage: pg = RDFInterpreter().pg
         sage: instr_infix('mul', pg('SS', 'S'), '*')
         mul: SS->S = 'o0 = i0 * i1;'
@@ -327,8 +327,8 @@ def instr_funcall_2args(name, io, op):
 
     EXAMPLES::
 
-        sage: from sage_setup.autogen.interpreters import *
-        sage: from sage_setup.autogen.interpreters.specs.rdf import RDFInterpreter
+        sage: from sage_setup.autogen.interpreters.internal import *
+        sage: from sage_setup.autogen.interpreters.internal.specs.rdf import RDFInterpreter
         sage: pg = RDFInterpreter().pg
         sage: instr_funcall_2args('atan2', pg('SS', 'S'), 'atan2')
         atan2: SS->S = 'o0 = atan2(i0, i1);'
@@ -343,8 +343,8 @@ def instr_unary(name, io, op):
 
     EXAMPLES::
 
-        sage: from sage_setup.autogen.interpreters import *
-        sage: from sage_setup.autogen.interpreters.specs.rdf import RDFInterpreter
+        sage: from sage_setup.autogen.interpreters.internal import *
+        sage: from sage_setup.autogen.interpreters.internal.specs.rdf import RDFInterpreter
         sage: pg = RDFInterpreter().pg
         sage: instr_unary('sin', pg('S','S'), 'sin(i0)')
         sin: S->S = 'o0 = sin(i0);'
@@ -361,8 +361,8 @@ def instr_funcall_2args_mpfr(name, io, op):
 
     EXAMPLES::
 
-        sage: from sage_setup.autogen.interpreters import *
-        sage: from sage_setup.autogen.interpreters.specs.rr import RRInterpreter
+        sage: from sage_setup.autogen.interpreters.internal import *
+        sage: from sage_setup.autogen.interpreters.internal.specs.rr import RRInterpreter
         sage: pg = RRInterpreter().pg
         sage: instr_funcall_2args_mpfr('add', pg('SS','S'), 'mpfr_add')
         add: SS->S = 'mpfr_add(o0, i0, i1, MPFR_RNDN);'
@@ -377,8 +377,8 @@ def instr_funcall_1arg_mpfr(name, io, op):
 
     EXAMPLES::
 
-        sage: from sage_setup.autogen.interpreters import *
-        sage: from sage_setup.autogen.interpreters.specs.rr import RRInterpreter
+        sage: from sage_setup.autogen.interpreters.internal import *
+        sage: from sage_setup.autogen.interpreters.internal.specs.rr import RRInterpreter
         sage: pg = RRInterpreter().pg
         sage: instr_funcall_1arg_mpfr('exp', pg('S','S'), 'mpfr_exp')
         exp: S->S = 'mpfr_exp(o0, i0, MPFR_RNDN);'
@@ -392,8 +392,8 @@ def instr_funcall_2args_mpc(name, io, op):
 
     EXAMPLES::
 
-        sage: from sage_setup.autogen.interpreters import *
-        sage: from sage_setup.autogen.interpreters.specs.cc import CCInterpreter
+        sage: from sage_setup.autogen.interpreters.internal import *
+        sage: from sage_setup.autogen.interpreters.internal.specs.cc import CCInterpreter
         sage: pg = CCInterpreter().pg
         sage: instr_funcall_2args_mpc('add', pg('SS','S'), 'mpc_add')
         add: SS->S = 'mpc_add(o0, i0, i1, MPC_RNDNN);'
@@ -407,8 +407,8 @@ def instr_funcall_1arg_mpc(name, io, op):
 
     EXAMPLES::
 
-        sage: from sage_setup.autogen.interpreters import *
-        sage: from sage_setup.autogen.interpreters.specs.cc import CCInterpreter
+        sage: from sage_setup.autogen.interpreters.internal import *
+        sage: from sage_setup.autogen.interpreters.internal.specs.cc import CCInterpreter
         sage: pg = CCInterpreter().pg
         sage: instr_funcall_1arg_mpc('exp', pg('S','S'), 'mpc_exp')
         exp: S->S = 'mpc_exp(o0, i0, MPC_RNDNN);'