passagemath-environment 10.4.58__tar.gz → 10.5.1__tar.gz

{passagemath_environment-10.4.58/passagemath_environment.egg-info → passagemath_environment-10.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: passagemath-environment
-Version: 10.4.58
+Version: 10.5.1
 Summary: passagemath: System and software environment
 Author-email: The Sage Developers <sage-support@googlegroups.com>
 Maintainer: Matthias Köppe, passagemath contributors
@@ -29,11 +29,11 @@ Classifier: Topic :: Scientific/Engineering :: Mathematics
 Requires-Python: <3.13,>=3.9
 Description-Content-Type: text/x-rst
 Provides-Extra: conf
-Requires-Dist: passagemath-conf~=10.4.58.0; extra == "conf"
+Requires-Dist: passagemath-conf~=10.5.1.0; extra == "conf"
 Provides-Extra: docbuild
-Requires-Dist: passagemath-docbuild~=10.4.58.0; extra == "docbuild"
+Requires-Dist: passagemath-docbuild~=10.5.1.0; extra == "docbuild"
 Provides-Extra: sage
-Requires-Dist: passagemath-standard~=10.4.58.0; extra == "sage"
+Requires-Dist: passagemath-standard~=10.5.1.0; extra == "sage"
 Provides-Extra: cython
 Requires-Dist: cython!=3.0.3,<4.0,>=3.0; extra == "cython"
 Requires-Dist: cython<3.1.0,>=3.0.8; extra == "cython"
@@ -44,7 +44,7 @@ Requires-Dist: rst2ipynb>=0.2.2; extra == "rst2ipynb"
 Provides-Extra: tox
 Requires-Dist: tox>=4.11; extra == "tox"
 Provides-Extra: sws2rst
-Requires-Dist: passagemath-sws2rst~=10.4.58.0; extra == "sws2rst"
+Requires-Dist: passagemath-sws2rst~=10.5.1.0; extra == "sws2rst"
 
 =========================================================================
  passagemath: System and software environment

passagemath_environment-10.5.1/VERSION.txt

@@ -0,0 +1 @@
+10.5.1

{passagemath_environment-10.4.58 → passagemath_environment-10.5.1}/bin/sage

@@ -173,7 +173,7 @@ if [ -x "${SELF}-venv-config" ]; then
     if [ -z "$SAGE_VENV" ]; then
         export SAGE_VENV=$("${SELF}-venv-config" SAGE_VENV)
     fi
-    SAGE_WHEELS_PATH=$("${SELF}-venv-config" SAGE_WHEELS_PATH)
+    SAGE_WHEELS_PATH=$("${SELF}-venv-config" SAGE_WHEELS_PATH 2>/dev/null)
 fi
 if [ -f "${SELF}-env-config" ]; then
     # As of Issue #22731, sage-env-config is optional.

{passagemath_environment-10.4.58 → passagemath_environment-10.5.1}/bin/sage-env

@@ -386,12 +386,15 @@ if [ -n "$SAGE_LOCAL" ]; then
        # "Toolchains/XcodeDefault.xctoolchain/usr/bin/".  (See #37237.)
        if [ -z "$LD" ]; then
 	   # Running xcode-select on a system with no toolchain writes an
-	   # error message to stderr, so redirect stderr to /dev/null. 
+	   # error message to stderr, so redirect stderr to /dev/null.
 	   XCODE_PATH=$(/usr/bin/xcode-select -p 2> /dev/null)
 	   if [ -n $XCODE_PATH ]; then
                if [ -x "$XCODE_PATH/usr/bin/ld-classic" -o \
 		       -x "$XCODE_PATH/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld-classic" ]; then
-		   LDFLAGS="$LDFLAGS -Wl,-ld_classic"
+                   # Add -ld_classic only if -ld_classic is not deprecated.
+                   if [ -z "$(ld -ld_classic 2>&1 | grep 'ld_classic is deprecated')" ]; then
+		       LDFLAGS="$LDFLAGS -Wl,-ld_classic"
+                   fi
                fi
            else
                # On a macOS system with no toolchain we don't want this script

{passagemath_environment-10.4.58 → passagemath_environment-10.5.1}/bin/sage-fixdoctests

@@ -56,6 +56,8 @@ parser.add_argument("--distribution", type=str, default=[], action='append',
                     help="distribution package to test, e.g., 'sagemath-graphs', 'sagemath-combinat[modules]'; sets defaults for --venv and --environment. This option can be repeated to test several distributions")
 parser.add_argument("--fixed-point", default=False, action="store_true",
                     help="whether to repeat until stable")
+parser.add_argument("--toxenv", type=str, default='sagepython-sagewheels-nopypi-norequirements',
+                    help="tox environment name where 'sage -t' is to be run")
 parser.add_argument("--venv", type=str, default='',
                     help="directory name of a venv where 'sage -t' is to be run")
 parser.add_argument("--environment", type=str, default='',
@@ -95,10 +97,10 @@ def plain_distribution_and_extras(distribution):
     m = re.fullmatch(r'([^[]*)(\[([^]]*)\])?', distribution)
     return m.group(1), m.group(3)
 
-def default_venv_environment_from_distribution(distribution):
+def default_venv_environment_from_distribution(distribution, toxenv):
     if distribution:
         plain_distribution, extras = plain_distribution_and_extras(distribution)
-        tox_env_name = 'sagepython-sagewheels-nopypi-norequirements'
+        tox_env_name = toxenv or 'sagepython-sagewheels-nopypi-norequirements'
         if extras:
             tox_env_name += '-' + extras.replace(',', '-')
         default_venv = os.path.join(SAGE_ROOT, 'pkgs', plain_distribution, '.tox', tox_env_name)
@@ -113,16 +115,16 @@ def default_venv_environment_from_distribution(distribution):
 
 
 @cached_function
-def venv_explainer(distribution, venv=None, environment=None):
+def venv_explainer(distribution, venv=None, environment=None, toxenv=None):
     venv_explainers = []
-    default_venv, default_environment = default_venv_environment_from_distribution(distribution)
+    default_venv, default_environment = default_venv_environment_from_distribution(distribution, toxenv)
     if venv:
         if m := re.search(f'pkgs/(sage[^/]*)/[.]tox/((sagepython|sagewheels|nopypi|norequirements)-*)*([^/]*)$',
                           venv):
             distribution, extras = m.group(1), m.group(4)
             if extras:
                 distribution += '[' + extras.replace('-', ',') + ']'
-            default_venv_given_distribution, default_environment_given_distribution = default_venv_environment_from_distribution(distribution)
+            default_venv_given_distribution, default_environment_given_distribution = default_venv_environment_from_distribution(distribution, toxenv)
 
             if (Path(venv).resolve() == Path(default_venv_given_distribution).resolve()
                     or not environment or environment == default_environment_given_distribution):
@@ -557,11 +559,11 @@ def process_grouped_blocks(grouped_iterator, distribution=None, venv=None, envir
                     print(f"{count:6} {' '.join(sorted(tags)) or '(untagged)'}")
 
 
-def fix_with_distribution(file_set, distribution=None, verbose=False):
+def fix_with_distribution(file_set, distribution=None, toxenv=None, verbose=False):
     if verbose:
         print("#" * 78)
         print(f"sage-fixdoctests: Fixing with --distribution={shlex.quote(distribution)}")
-    default_venv, default_environment = default_venv_environment_from_distribution(distribution)
+    default_venv, default_environment = default_venv_environment_from_distribution(distribution, toxenv)
     venv = args.venv or default_venv
     environment = args.environment or default_environment
     file_set_to_process = sorted(file_set)
@@ -641,10 +643,10 @@ if __name__ == "__main__":
         if args.no_test:
             pass
         elif len(args.distribution) == 1 and not args.fixed_point:
-            fix_with_distribution(set(unprocessed_files), args.distribution[0])
+            fix_with_distribution(set(unprocessed_files), args.distribution[0], toxenv=args.toxenv)
         else:
             for distribution, file_set in venv_files.items():
-                fix_with_distribution(file_set, distribution, verbose=True)
+                fix_with_distribution(file_set, distribution, verbose=True, toxenv=args.toxenv)
             if args.fixed_point:
                 if args.probe:
                     print(f"sage-fixdoctests: Turning off --probe for the following iterations")
@@ -657,7 +659,7 @@ if __name__ == "__main__":
                     if not file_set:
                         break
                     while file_set:
-                        fix_with_distribution(file_set, distribution, verbose=True)
+                        fix_with_distribution(file_set, distribution, verbose=True, toxenv=args.toxenv)
                         # Immediately re-run with the same distribution to continue chains of
                         # "NameError" / "variable was set only in doctest" fixes
 
@@ -679,7 +681,7 @@ if __name__ == "__main__":
                     if distribution == '':
                         continue
                     plain_distribution, extras = plain_distribution_and_extras(distribution)
-                    default_venv, _ = default_venv_environment_from_distribution(distribution)
+                    default_venv, _ = default_venv_environment_from_distribution(distribution, args.toxenv)
                     venv = args.venv or default_venv
                     try:
                         stats_filename = os.path.join(default_venv, '.sage/timings2.json')

{passagemath_environment-10.4.58 → passagemath_environment-10.5.1}/bin/sage-version.sh

@@ -4,6 +4,6 @@
 # which stops "setup.py develop" from rewriting it as a Python file.
 :
 # This file is auto-generated by the sage-update-version script, do not edit!
-SAGE_VERSION='10.4.58'
-SAGE_RELEASE_DATE='2024-11-11'
-SAGE_VERSION_BANNER='passagemath version 10.4.58, Release Date: 2024-11-11'
+SAGE_VERSION='10.5.1'
+SAGE_RELEASE_DATE='2024-12-05'
+SAGE_VERSION_BANNER='passagemath version 10.5.1, Release Date: 2024-12-05'

{passagemath_environment-10.4.58 → passagemath_environment-10.5.1/passagemath_environment.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: passagemath-environment
-Version: 10.4.58
+Version: 10.5.1
 Summary: passagemath: System and software environment
 Author-email: The Sage Developers <sage-support@googlegroups.com>
 Maintainer: Matthias Köppe, passagemath contributors
@@ -29,11 +29,11 @@ Classifier: Topic :: Scientific/Engineering :: Mathematics
 Requires-Python: <3.13,>=3.9
 Description-Content-Type: text/x-rst
 Provides-Extra: conf
-Requires-Dist: passagemath-conf~=10.4.58.0; extra == "conf"
+Requires-Dist: passagemath-conf~=10.5.1.0; extra == "conf"
 Provides-Extra: docbuild
-Requires-Dist: passagemath-docbuild~=10.4.58.0; extra == "docbuild"
+Requires-Dist: passagemath-docbuild~=10.5.1.0; extra == "docbuild"
 Provides-Extra: sage
-Requires-Dist: passagemath-standard~=10.4.58.0; extra == "sage"
+Requires-Dist: passagemath-standard~=10.5.1.0; extra == "sage"
 Provides-Extra: cython
 Requires-Dist: cython!=3.0.3,<4.0,>=3.0; extra == "cython"
 Requires-Dist: cython<3.1.0,>=3.0.8; extra == "cython"
@@ -44,7 +44,7 @@ Requires-Dist: rst2ipynb>=0.2.2; extra == "rst2ipynb"
 Provides-Extra: tox
 Requires-Dist: tox>=4.11; extra == "tox"
 Provides-Extra: sws2rst
-Requires-Dist: passagemath-sws2rst~=10.4.58.0; extra == "sws2rst"
+Requires-Dist: passagemath-sws2rst~=10.5.1.0; extra == "sws2rst"
 
 =========================================================================
  passagemath: System and software environment

{passagemath_environment-10.4.58 → passagemath_environment-10.5.1}/passagemath_environment.egg-info/SOURCES.txt

@@ -55,7 +55,9 @@ sage/features/coxeter3.py
 sage/features/csdp.py
 sage/features/cython.py
 sage/features/databases.py
+sage/features/dot2tex.py
 sage/features/dvipng.py
+sage/features/eclib.py
 sage/features/ecm.py
 sage/features/ffmpeg.py
 sage/features/four_ti_2.py
@@ -68,6 +70,7 @@ sage/features/graph_generators.py
 sage/features/graphviz.py
 sage/features/igraph.py
 sage/features/imagemagick.py
+sage/features/info.py
 sage/features/interfaces.py
 sage/features/internet.py
 sage/features/jmol.py
@@ -96,9 +99,11 @@ sage/features/sagemath.py
 sage/features/sat.py
 sage/features/singular.py
 sage/features/sirocco.py
+sage/features/sloane_database.py
 sage/features/sphinx.py
 sage/features/standard.py
 sage/features/symengine_py.py
+sage/features/sympow.py
 sage/features/tdlib.py
 sage/features/threejs.py
 sage/features/topcom.py

{passagemath_environment-10.4.58 → passagemath_environment-10.5.1}/passagemath_environment.egg-info/requires.txt

@@ -1,13 +1,13 @@
 
 [conf]
-passagemath-conf~=10.4.58.0
+passagemath-conf~=10.5.1.0
 
 [cython]
 cython!=3.0.3,<4.0,>=3.0
 cython<3.1.0,>=3.0.8
 
 [docbuild]
-passagemath-docbuild~=10.4.58.0
+passagemath-docbuild~=10.5.1.0
 
 [pytest]
 pytest
@@ -16,10 +16,10 @@ pytest
 rst2ipynb>=0.2.2
 
 [sage]
-passagemath-standard~=10.4.58.0
+passagemath-standard~=10.5.1.0
 
 [sws2rst]
-passagemath-sws2rst~=10.4.58.0
+passagemath-sws2rst~=10.5.1.0
 
 [tox]
 tox>=4.11

{passagemath_environment-10.4.58 → passagemath_environment-10.5.1}/pyproject.toml

@@ -46,14 +46,14 @@ documentation = "https://doc.sagemath.org"
 "tracker" = "https://github.com/passagemath/passagemath/issues"
 
 [project.optional-dependencies]
-conf      = ['passagemath-conf ~= 10.4.58.0',]           # sage.env can optionally use sage_conf
-docbuild  = ['passagemath-docbuild ~= 10.4.58.0',]       # For "sage --docbuild"
-sage      = ['passagemath-standard ~= 10.4.58.0',]             # For "sage", "sage -t", ...
+conf      = ['passagemath-conf ~= 10.5.1.0',]           # sage.env can optionally use sage_conf
+docbuild  = ['passagemath-docbuild ~= 10.5.1.0',]       # For "sage --docbuild"
+sage      = ['passagemath-standard ~= 10.5.1.0',]             # For "sage", "sage -t", ...
 cython    = ['cython >=3.0, != 3.0.3, <4.0', 'cython >=3.0.8,<3.1.0',]              # For "sage --cython"
 pytest    = ['pytest',]              # For "sage --pytest"
 rst2ipynb = ['rst2ipynb >=0.2.2',]           # For "sage --rst2ipynb"
 tox       = ['tox >= 4.11',]                 # For "sage --tox"
-sws2rst   = ['passagemath-sws2rst ~= 10.4.58.0',]        # For "sage --sws2rst"
+sws2rst   = ['passagemath-sws2rst ~= 10.5.1.0',]        # For "sage --sws2rst"
 
 [project.readme]
 file = "README.rst"

{passagemath_environment-10.4.58 → passagemath_environment-10.5.1}/sage/env.py

@@ -36,6 +36,7 @@ AUTHORS:
 
 from typing import Optional
 import sage
+import platform
 import os
 import socket
 import sys
@@ -165,7 +166,6 @@ def var(key: str, *fallbacks: Optional[str], force: bool = False) -> Optional[st
 
 
 # system info
-UNAME = var("UNAME", os.uname()[0])
 HOSTNAME = var("HOSTNAME", socket.gethostname())
 LOCAL_IDENTIFIER = var("LOCAL_IDENTIFIER", "{}.{}".format(HOSTNAME, os.getpid()))
 
@@ -207,12 +207,22 @@ SAGE_STARTUP_FILE = var("SAGE_STARTUP_FILE", join(DOT_SAGE, "init.sage"))
 SAGE_ARCHFLAGS = var("SAGE_ARCHFLAGS", "unset")
 SAGE_PKG_CONFIG_PATH = var("SAGE_PKG_CONFIG_PATH")
 
+try:
+    import sage_wheels
+except ImportError:
+    _sage_wheels_path = []
+else:
+    _sage_wheels_path = sage_wheels.__path__
+
 # colon-separated search path for databases.
 SAGE_DATA_PATH = var("SAGE_DATA_PATH",
                      os.pathsep.join(filter(None, [
-                         join(DOT_SAGE, "db"),
-                         join(SAGE_SHARE, "sagemath"),
-                         SAGE_SHARE,
+                             join(DOT_SAGE, "db"),
+                         ] + [
+                             join(p, "share") for p in _sage_wheels_path
+                         ] + [
+                             join(SAGE_SHARE, "sagemath"),
+                             SAGE_SHARE,
                          ])))
 
 # database directories, the default is to search in SAGE_DATA_PATH

{passagemath_environment-10.4.58 → passagemath_environment-10.5.1}/sage/features/cddlib.py

@@ -23,7 +23,7 @@ class CddExecutable(Executable):
     EXAMPLES::
 
         sage: from sage.features.cddlib import CddExecutable
-        sage: CddExecutable().is_present()
+        sage: CddExecutable().is_present()                                              # needs cddexec_gmp
         FeatureTestResult('cddexec_gmp', True)
     """
     def __init__(self, name='cddexec_gmp'):

{passagemath_environment-10.4.58 → passagemath_environment-10.5.1}/sage/features/databases.py

@@ -69,7 +69,7 @@ class DatabaseCremona(StaticFile):
         from sage.env import CREMONA_MINI_DATA_DIR, CREMONA_LARGE_DATA_DIR
         CREMONA_DATA_DIRS = set([CREMONA_MINI_DATA_DIR, CREMONA_LARGE_DATA_DIR])
         CREMONA_DATA_DIRS.discard(None)
-        search_path = CREMONA_DATA_DIRS or sage_data_path("cremona")
+        search_path = list(CREMONA_DATA_DIRS) + sage_data_path("cremona")
 
         spkg = "database_cremona_ellcurve"
         spkg_type = "optional"
@@ -106,7 +106,10 @@ class DatabaseEllcurves(StaticFile):
             True
         """
         from sage.env import ELLCURVE_DATA_DIR
-        search_path = ELLCURVE_DATA_DIR or sage_data_path("ellcurves")
+        search_path = []
+        if ELLCURVE_DATA_DIR is not None:
+            search_path.append(ELLCURVE_DATA_DIR)
+        search_path.extend(sage_data_path("ellcurves"))
 
         StaticFile.__init__(self, "database_ellcurves",
                             filename='rank0',
@@ -136,7 +139,10 @@ class DatabaseGraphs(StaticFile):
             True
         """
         from sage.env import GRAPHS_DATA_DIR
-        search_path = GRAPHS_DATA_DIR or sage_data_path("graphs")
+        search_path = []
+        if GRAPHS_DATA_DIR is not None:
+            search_path.append(GRAPHS_DATA_DIR)
+        search_path.extend(sage_data_path("graphs"))
 
         StaticFile.__init__(self, "database_graphs",
                             filename='graphs.db',
@@ -277,7 +283,10 @@ class DatabaseReflexivePolytopes(StaticFile):
             'Hodge4d'
         """
         from sage.env import POLYTOPE_DATA_DIR
-        search_path = POLYTOPE_DATA_DIR or sage_data_path("reflexive_polytopes")
+        search_path = []
+        if POLYTOPE_DATA_DIR is not None:
+            search_path.append(POLYTOPE_DATA_DIR)
+        search_path.extend(sage_data_path("reflexive_polytopes"))
 
         dirname = "Full3d"
         if name == "polytopes_db_4d":

passagemath_environment-10.5.1/sage/features/dot2tex.py

@@ -0,0 +1,42 @@
+# sage_setup: distribution = sagemath-environment
+r"""
+Check for ``dot2tex``
+"""
+
+# *****************************************************************************
+#       Copyright (C) 2024 Kwankyu Lee
+#
+#  Distributed under the terms of the GNU General Public License (GPL)
+#  as published by the Free Software Foundation; either version 2 of
+#  the License, or (at your option) any later version.
+#                  https://www.gnu.org/licenses/
+# *****************************************************************************
+
+from . import PythonModule
+
+
+class dot2tex(PythonModule):
+    r"""
+    A :class:`sage.features.Feature` describing the presence of :ref:`dot2tex <spkg_dot2tex>`.
+
+    dot2tex is provided by an optional package in the Sage distribution.
+
+    EXAMPLES::
+
+        sage: from sage.features.dot2tex import dot2tex
+        sage: dot2tex().is_present()                     # optional - dot2tex
+        FeatureTestResult('dot2tex', True)
+    """
+    def __init__(self):
+        r"""
+        TESTS::
+
+            sage: from sage.features.dot2tex import dot2tex
+            sage: isinstance(dot2tex(), dot2tex)
+            True
+        """
+        PythonModule.__init__(self, 'dot2tex', spkg='dot2tex')
+
+
+def all_features():
+    return [dot2tex()]

passagemath_environment-10.5.1/sage/features/eclib.py

@@ -0,0 +1,46 @@
+# sage_setup: distribution = sagemath-environment
+r"""
+Feature for testing the presence of eclib
+"""
+
+# *****************************************************************************
+#       Copyright (C) 2024 Matthias Koeppe
+#
+#  Distributed under the terms of the GNU General Public License (GPL)
+#  as published by the Free Software Foundation; either version 2 of
+#  the License, or (at your option) any later version.
+#                  https://www.gnu.org/licenses/
+# *****************************************************************************
+
+import subprocess
+from . import Executable, FeatureTestResult, PythonModule
+from .join_feature import JoinFeature
+
+
+class Mwrank(Executable):
+    r"""
+    A :class:`~sage.features.Feature` describing the presence of mwrank.
+
+    EXAMPLES::
+
+        sage: from sage.features.eclib import Mwrank
+        sage: Mwrank().is_present()                             # needs eclib
+        FeatureTestResult('mwrank', True)
+    """
+    def __init__(self):
+        r"""
+        TESTS::
+
+            sage: from sage.features.eclib import Mwrank
+            sage: isinstance(Mwrank(), Mwrank)
+            True
+        """
+        Executable.__init__(self, "mwrank", executable='mwrank',
+                            spkg='eclib', type='standard')
+
+
+def all_features():
+    return [JoinFeature("eclib",
+                        (Mwrank(),
+                         PythonModule('sage.libs.eclib')),
+                        spkg='sagemath_eclib', type='standard')]

{passagemath_environment-10.4.58 → passagemath_environment-10.5.1}/sage/features/ecm.py

@@ -12,7 +12,8 @@ Feature for testing the presence of ``ecm`` or ``gmp-ecm``
 #                  https://www.gnu.org/licenses/
 # ****************************************************************************
 
-from . import Executable
+from . import Executable, PythonModule
+from .join_feature import JoinFeature
 from sage.env import SAGE_ECMBIN
 
 
@@ -23,8 +24,8 @@ class Ecm(Executable):
     EXAMPLES::
 
         sage: from sage.features.ecm import Ecm
-        sage: Ecm().is_present()
-        FeatureTestResult('ecm', True)
+        sage: Ecm().is_present()                                                        # needs ecm
+        FeatureTestResult('ecm_executable', True)
     """
     def __init__(self):
         r"""
@@ -34,9 +35,12 @@ class Ecm(Executable):
             sage: isinstance(Ecm(), Ecm)
             True
         """
-        Executable.__init__(self, name='ecm', executable=SAGE_ECMBIN,
+        Executable.__init__(self, name='ecm_executable', executable=SAGE_ECMBIN,
                             spkg='ecm', type='standard')
 
 
 def all_features():
-    return [Ecm()]
+    return [JoinFeature("ecm",
+                        (Ecm(),
+                         PythonModule('sage.interfaces.ecm')),
+                        spkg='sagemath_libecm', type='standard')]

{passagemath_environment-10.4.58 → passagemath_environment-10.5.1}/sage/features/fricas.py

@@ -14,7 +14,9 @@ Features for testing the presence of ``fricas``
 
 import os
 import subprocess
-from . import Executable, FeatureTestResult
+from . import Executable, FeatureTestResult, PythonModule
+from .join_feature import JoinFeature
+
 
 class FriCAS(Executable):
     r"""
@@ -24,7 +26,7 @@ class FriCAS(Executable):
 
         sage: from sage.features.fricas import FriCAS
         sage: FriCAS().is_present()  # optional - fricas
-        FeatureTestResult('fricas', True)
+        FeatureTestResult('fricas_executable', True)
     """
     def __init__(self):
         r"""
@@ -34,7 +36,7 @@ class FriCAS(Executable):
             sage: isinstance(FriCAS(), FriCAS)
             True
         """
-        Executable.__init__(self, name='fricas', spkg='fricas',
+        Executable.__init__(self, name='fricas_executable', spkg='fricas',
                             executable='fricas',
                             url='https://fricas.github.io')
 
@@ -62,5 +64,9 @@ class FriCAS(Executable):
 
         return FeatureTestResult(self, True)
 
+
 def all_features():
-    return [FriCAS()]
+    return [JoinFeature("fricas",
+                        (FriCAS(),
+                         PythonModule('sage.interfaces.fricas')),
+                        spkg='sagemath_fricas')]

{passagemath_environment-10.4.58 → passagemath_environment-10.5.1}/sage/features/frobby.py

@@ -13,8 +13,9 @@ Feature for testing the presence of FROBBY
 # *****************************************************************************
 
 import subprocess
-from . import Executable
-from . import FeatureTestResult
+from . import Executable, FeatureTestResult, PythonModule
+from .join_feature import JoinFeature
+
 
 class Frobby(Executable):
     r"""
@@ -24,7 +25,7 @@ class Frobby(Executable):
 
         sage: from sage.features.frobby import Frobby
         sage: Frobby().is_present()  # optional - frobby
-        FeatureTestResult('frobby', True)
+        FeatureTestResult('frobby_executable', True)
     """
     def __init__(self):
         r"""
@@ -34,9 +35,12 @@ class Frobby(Executable):
             sage: isinstance(Frobby(), Frobby)
             True
         """
-        Executable.__init__(self, "frobby", executable='frobby',
+        Executable.__init__(self, "frobby_executable", executable='frobby',
                             spkg='frobby')
 
 
 def all_features():
-    return [Frobby()]
+    return [JoinFeature("frobby",
+                        (Frobby(),
+                         PythonModule('sage.interfaces.frobby')),
+                        spkg='sagemath_frobby')]

{passagemath_environment-10.4.58 → passagemath_environment-10.5.1}/sage/features/gfan.py

@@ -12,7 +12,8 @@ Features for testing the presence of ``gfan``
 #                  https://www.gnu.org/licenses/
 # *****************************************************************************
 
-from . import Executable
+from . import Executable, PythonModule
+from .join_feature import JoinFeature
 
 
 class GfanExecutable(Executable):
@@ -28,11 +29,15 @@ class GfanExecutable(Executable):
             True
         """
         if cmd is None:
-            name = "gfan"
+            name = "gfan_executable"
+            executable = "gfan"
         else:
-            name = f"gfan_{cmd}"
-        Executable.__init__(self, name, executable=name, spkg='gfan', type='standard')
+            executable = name = f"gfan_{cmd}"
+        Executable.__init__(self, name, executable=executable, spkg='gfan', type='standard')
 
 
 def all_features():
-    return [GfanExecutable()]
+    return [JoinFeature("gfan",
+                        (GfanExecutable(),
+                         PythonModule('sage.interfaces.gfan')),
+                        spkg='sagemath_gfan', type='standard')]

{passagemath_environment-10.4.58 → passagemath_environment-10.5.1}/sage/features/giac.py

@@ -3,7 +3,9 @@ r"""
 Feature for testing the presence of ``giac``
 """
 
-from . import Executable, FeatureTestResult
+from . import Executable, FeatureTestResult, PythonModule
+from .join_feature import JoinFeature
+
 
 class Giac(Executable):
     r"""
@@ -13,7 +15,7 @@ class Giac(Executable):
 
         sage: from sage.features.giac import Giac
         sage: Giac().is_present()  # needs giac
-        FeatureTestResult('giac', True)
+        FeatureTestResult('giac_executable', True)
     """
     def __init__(self):
         r"""
@@ -23,8 +25,11 @@ class Giac(Executable):
             sage: isinstance(Giac(), Giac)
             True
         """
-        Executable.__init__(self, 'giac', executable='giac',
+        Executable.__init__(self, 'giac_executable', executable='giac',
                             spkg='giac', type='standard')
 
 def all_features():
-    return [Giac()]
+    return [JoinFeature("giac",
+                        (Giac(),
+                         PythonModule('sage.interfaces.giac')),
+                        spkg='sagemath_giac', type='standard')]