passagemath-environment 10.4.61__tar.gz → 10.4.62__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (114) hide show
  1. {passagemath_environment-10.4.61/passagemath_environment.egg-info → passagemath_environment-10.4.62}/PKG-INFO +5 -5
  2. passagemath_environment-10.4.62/VERSION.txt +1 -0
  3. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-env +5 -2
  4. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-version.sh +3 -3
  5. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62/passagemath_environment.egg-info}/PKG-INFO +5 -5
  6. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/passagemath_environment.egg-info/SOURCES.txt +1 -0
  7. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/passagemath_environment.egg-info/requires.txt +4 -4
  8. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/pyproject.toml +4 -4
  9. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/env.py +1 -1
  10. passagemath_environment-10.4.62/sage/features/info.py +30 -0
  11. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/macaulay2.py +8 -4
  12. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/sagemath.py +1 -0
  13. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/misc/viewer.py +2 -1
  14. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/version.py +3 -3
  15. passagemath_environment-10.4.61/VERSION.txt +0 -1
  16. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/MANIFEST.in +0 -0
  17. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/README.rst +0 -0
  18. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/math-readline +0 -0
  19. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage +0 -0
  20. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-cachegrind +0 -0
  21. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-callgrind +0 -0
  22. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-cleaner +0 -0
  23. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-coverage +0 -0
  24. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-cython +0 -0
  25. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-env-config.in +0 -0
  26. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-eval +0 -0
  27. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-fixdoctests +0 -0
  28. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-grep +0 -0
  29. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-grepdoc +0 -0
  30. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-inline-fortran +0 -0
  31. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-ipynb2rst +0 -0
  32. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-ipython +0 -0
  33. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-list-packages +0 -0
  34. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-massif +0 -0
  35. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-notebook +0 -0
  36. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-num-threads.py +0 -0
  37. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-omega +0 -0
  38. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-preparse +0 -0
  39. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-python +0 -0
  40. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-run +0 -0
  41. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-run-cython +0 -0
  42. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-runtests +0 -0
  43. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-src-env-config.in +0 -0
  44. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-startuptime.py +0 -0
  45. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-update-version +0 -0
  46. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-valgrind +0 -0
  47. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/bin/sage-venv-config +0 -0
  48. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/passagemath_environment.egg-info/dependency_links.txt +0 -0
  49. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/passagemath_environment.egg-info/top_level.txt +0 -0
  50. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/pyproject.toml.m4 +0 -0
  51. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/requirements-editable.txt.m4 +0 -0
  52. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/requirements.txt.m4 +0 -0
  53. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/all__sagemath_environment.py +0 -0
  54. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/__init__.py +0 -0
  55. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/all.py +0 -0
  56. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/bliss.py +0 -0
  57. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/cddlib.py +0 -0
  58. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/coxeter3.py +0 -0
  59. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/csdp.py +0 -0
  60. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/cython.py +0 -0
  61. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/databases.py +0 -0
  62. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/dvipng.py +0 -0
  63. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/ecm.py +0 -0
  64. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/ffmpeg.py +0 -0
  65. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/four_ti_2.py +0 -0
  66. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/fricas.py +0 -0
  67. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/frobby.py +0 -0
  68. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/gap.py +0 -0
  69. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/gfan.py +0 -0
  70. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/giac.py +0 -0
  71. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/graph_generators.py +0 -0
  72. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/graphviz.py +0 -0
  73. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/igraph.py +0 -0
  74. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/imagemagick.py +0 -0
  75. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/interfaces.py +0 -0
  76. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/internet.py +0 -0
  77. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/jmol.py +0 -0
  78. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/join_feature.py +0 -0
  79. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/kenzo.py +0 -0
  80. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/latex.py +0 -0
  81. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/latte.py +0 -0
  82. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/lrs.py +0 -0
  83. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/mcqd.py +0 -0
  84. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/meataxe.py +0 -0
  85. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/mip_backends.py +0 -0
  86. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/msolve.py +0 -0
  87. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/nauty.py +0 -0
  88. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/normaliz.py +0 -0
  89. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/palp.py +0 -0
  90. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/pandoc.py +0 -0
  91. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/pdf2svg.py +0 -0
  92. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/phitigra.py +0 -0
  93. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/pkg_systems.py +0 -0
  94. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/polymake.py +0 -0
  95. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/poppler.py +0 -0
  96. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/qepcad.py +0 -0
  97. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/rubiks.py +0 -0
  98. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/sat.py +0 -0
  99. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/singular.py +0 -0
  100. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/sirocco.py +0 -0
  101. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/sphinx.py +0 -0
  102. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/standard.py +0 -0
  103. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/symengine_py.py +0 -0
  104. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/sympow.py +0 -0
  105. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/tdlib.py +0 -0
  106. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/threejs.py +0 -0
  107. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/features/topcom.py +0 -0
  108. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/misc/all__sagemath_environment.py +0 -0
  109. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/misc/package.py +0 -0
  110. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/misc/package_dir.py +0 -0
  111. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/sage/misc/temporary_file.py +0 -0
  112. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/setup.cfg +0 -0
  113. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/setup.py +0 -0
  114. {passagemath_environment-10.4.61 → passagemath_environment-10.4.62}/tox.ini +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: passagemath-environment
3
- Version: 10.4.61
3
+ Version: 10.4.62
4
4
  Summary: passagemath: System and software environment
5
5
  Author-email: The Sage Developers <sage-support@googlegroups.com>
6
6
  Maintainer: Matthias Köppe, passagemath contributors
@@ -29,11 +29,11 @@ Classifier: Topic :: Scientific/Engineering :: Mathematics
29
29
  Requires-Python: <3.13,>=3.9
30
30
  Description-Content-Type: text/x-rst
31
31
  Provides-Extra: conf
32
- Requires-Dist: passagemath-conf~=10.4.61.0; extra == "conf"
32
+ Requires-Dist: passagemath-conf~=10.4.62.0; extra == "conf"
33
33
  Provides-Extra: docbuild
34
- Requires-Dist: passagemath-docbuild~=10.4.61.0; extra == "docbuild"
34
+ Requires-Dist: passagemath-docbuild~=10.4.62.0; extra == "docbuild"
35
35
  Provides-Extra: sage
36
- Requires-Dist: passagemath-standard~=10.4.61.0; extra == "sage"
36
+ Requires-Dist: passagemath-standard~=10.4.62.0; extra == "sage"
37
37
  Provides-Extra: cython
38
38
  Requires-Dist: cython!=3.0.3,<4.0,>=3.0; extra == "cython"
39
39
  Requires-Dist: cython<3.1.0,>=3.0.8; extra == "cython"
@@ -44,7 +44,7 @@ Requires-Dist: rst2ipynb>=0.2.2; extra == "rst2ipynb"
44
44
  Provides-Extra: tox
45
45
  Requires-Dist: tox>=4.11; extra == "tox"
46
46
  Provides-Extra: sws2rst
47
- Requires-Dist: passagemath-sws2rst~=10.4.61.0; extra == "sws2rst"
47
+ Requires-Dist: passagemath-sws2rst~=10.4.62.0; extra == "sws2rst"
48
48
 
49
49
  =========================================================================
50
50
  passagemath: System and software environment
@@ -0,0 +1 @@
1
+ 10.4.62
@@ -386,12 +386,15 @@ if [ -n "$SAGE_LOCAL" ]; then
386
386
  # "Toolchains/XcodeDefault.xctoolchain/usr/bin/". (See #37237.)
387
387
  if [ -z "$LD" ]; then
388
388
  # Running xcode-select on a system with no toolchain writes an
389
- # error message to stderr, so redirect stderr to /dev/null.
389
+ # error message to stderr, so redirect stderr to /dev/null.
390
390
  XCODE_PATH=$(/usr/bin/xcode-select -p 2> /dev/null)
391
391
  if [ -n $XCODE_PATH ]; then
392
392
  if [ -x "$XCODE_PATH/usr/bin/ld-classic" -o \
393
393
  -x "$XCODE_PATH/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld-classic" ]; then
394
- LDFLAGS="$LDFLAGS -Wl,-ld_classic"
394
+ # Add -ld_classic only if -ld_classic is not deprecated.
395
+ if [ -z "$(ld -ld_classic 2>&1 | grep 'ld_classic is deprecated')" ]; then
396
+ LDFLAGS="$LDFLAGS -Wl,-ld_classic"
397
+ fi
395
398
  fi
396
399
  else
397
400
  # On a macOS system with no toolchain we don't want this script
@@ -4,6 +4,6 @@
4
4
  # which stops "setup.py develop" from rewriting it as a Python file.
5
5
  :
6
6
  # This file is auto-generated by the sage-update-version script, do not edit!
7
- SAGE_VERSION='10.4.61'
8
- SAGE_RELEASE_DATE='2024-11-15'
9
- SAGE_VERSION_BANNER='passagemath version 10.4.61, Release Date: 2024-11-15'
7
+ SAGE_VERSION='10.4.62'
8
+ SAGE_RELEASE_DATE='2024-11-17'
9
+ SAGE_VERSION_BANNER='passagemath version 10.4.62, Release Date: 2024-11-17'
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: passagemath-environment
3
- Version: 10.4.61
3
+ Version: 10.4.62
4
4
  Summary: passagemath: System and software environment
5
5
  Author-email: The Sage Developers <sage-support@googlegroups.com>
6
6
  Maintainer: Matthias Köppe, passagemath contributors
@@ -29,11 +29,11 @@ Classifier: Topic :: Scientific/Engineering :: Mathematics
29
29
  Requires-Python: <3.13,>=3.9
30
30
  Description-Content-Type: text/x-rst
31
31
  Provides-Extra: conf
32
- Requires-Dist: passagemath-conf~=10.4.61.0; extra == "conf"
32
+ Requires-Dist: passagemath-conf~=10.4.62.0; extra == "conf"
33
33
  Provides-Extra: docbuild
34
- Requires-Dist: passagemath-docbuild~=10.4.61.0; extra == "docbuild"
34
+ Requires-Dist: passagemath-docbuild~=10.4.62.0; extra == "docbuild"
35
35
  Provides-Extra: sage
36
- Requires-Dist: passagemath-standard~=10.4.61.0; extra == "sage"
36
+ Requires-Dist: passagemath-standard~=10.4.62.0; extra == "sage"
37
37
  Provides-Extra: cython
38
38
  Requires-Dist: cython!=3.0.3,<4.0,>=3.0; extra == "cython"
39
39
  Requires-Dist: cython<3.1.0,>=3.0.8; extra == "cython"
@@ -44,7 +44,7 @@ Requires-Dist: rst2ipynb>=0.2.2; extra == "rst2ipynb"
44
44
  Provides-Extra: tox
45
45
  Requires-Dist: tox>=4.11; extra == "tox"
46
46
  Provides-Extra: sws2rst
47
- Requires-Dist: passagemath-sws2rst~=10.4.61.0; extra == "sws2rst"
47
+ Requires-Dist: passagemath-sws2rst~=10.4.62.0; extra == "sws2rst"
48
48
 
49
49
  =========================================================================
50
50
  passagemath: System and software environment
@@ -68,6 +68,7 @@ sage/features/graph_generators.py
68
68
  sage/features/graphviz.py
69
69
  sage/features/igraph.py
70
70
  sage/features/imagemagick.py
71
+ sage/features/info.py
71
72
  sage/features/interfaces.py
72
73
  sage/features/internet.py
73
74
  sage/features/jmol.py
@@ -1,13 +1,13 @@
1
1
 
2
2
  [conf]
3
- passagemath-conf~=10.4.61.0
3
+ passagemath-conf~=10.4.62.0
4
4
 
5
5
  [cython]
6
6
  cython!=3.0.3,<4.0,>=3.0
7
7
  cython<3.1.0,>=3.0.8
8
8
 
9
9
  [docbuild]
10
- passagemath-docbuild~=10.4.61.0
10
+ passagemath-docbuild~=10.4.62.0
11
11
 
12
12
  [pytest]
13
13
  pytest
@@ -16,10 +16,10 @@ pytest
16
16
  rst2ipynb>=0.2.2
17
17
 
18
18
  [sage]
19
- passagemath-standard~=10.4.61.0
19
+ passagemath-standard~=10.4.62.0
20
20
 
21
21
  [sws2rst]
22
- passagemath-sws2rst~=10.4.61.0
22
+ passagemath-sws2rst~=10.4.62.0
23
23
 
24
24
  [tox]
25
25
  tox>=4.11
@@ -46,14 +46,14 @@ documentation = "https://doc.sagemath.org"
46
46
  "tracker" = "https://github.com/passagemath/passagemath/issues"
47
47
 
48
48
  [project.optional-dependencies]
49
- conf = ['passagemath-conf ~= 10.4.61.0',] # sage.env can optionally use sage_conf
50
- docbuild = ['passagemath-docbuild ~= 10.4.61.0',] # For "sage --docbuild"
51
- sage = ['passagemath-standard ~= 10.4.61.0',] # For "sage", "sage -t", ...
49
+ conf = ['passagemath-conf ~= 10.4.62.0',] # sage.env can optionally use sage_conf
50
+ docbuild = ['passagemath-docbuild ~= 10.4.62.0',] # For "sage --docbuild"
51
+ sage = ['passagemath-standard ~= 10.4.62.0',] # For "sage", "sage -t", ...
52
52
  cython = ['cython >=3.0, != 3.0.3, <4.0', 'cython >=3.0.8,<3.1.0',] # For "sage --cython"
53
53
  pytest = ['pytest',] # For "sage --pytest"
54
54
  rst2ipynb = ['rst2ipynb >=0.2.2',] # For "sage --rst2ipynb"
55
55
  tox = ['tox >= 4.11',] # For "sage --tox"
56
- sws2rst = ['passagemath-sws2rst ~= 10.4.61.0',] # For "sage --sws2rst"
56
+ sws2rst = ['passagemath-sws2rst ~= 10.4.62.0',] # For "sage --sws2rst"
57
57
 
58
58
  [project.readme]
59
59
  file = "README.rst"
@@ -36,6 +36,7 @@ AUTHORS:
36
36
 
37
37
  from typing import Optional
38
38
  import sage
39
+ import platform
39
40
  import os
40
41
  import socket
41
42
  import sys
@@ -165,7 +166,6 @@ def var(key: str, *fallbacks: Optional[str], force: bool = False) -> Optional[st
165
166
 
166
167
 
167
168
  # system info
168
- UNAME = var("UNAME", os.uname()[0])
169
169
  HOSTNAME = var("HOSTNAME", socket.gethostname())
170
170
  LOCAL_IDENTIFIER = var("LOCAL_IDENTIFIER", "{}.{}".format(HOSTNAME, os.getpid()))
171
171
 
@@ -0,0 +1,30 @@
1
+ # sage_setup: distribution = sagemath-environment
2
+ r"""
3
+ Feature for testing the presence of ``info``, from GNU Info
4
+ """
5
+
6
+ from . import Executable
7
+
8
+ class Info(Executable):
9
+ r"""
10
+ A :class:`~sage.features.Feature` describing the presence of :ref:`info <spkg_info>`.
11
+
12
+ EXAMPLES::
13
+
14
+ sage: from sage.features.info import Info
15
+ sage: Info()
16
+ Feature('info')
17
+ """
18
+ def __init__(self):
19
+ r"""
20
+ TESTS::
21
+
22
+ sage: from sage.features.info import Info
23
+ sage: isinstance(Info(), Info)
24
+ True
25
+ """
26
+ Executable.__init__(self, 'info', executable='info',
27
+ spkg='info', type='standard')
28
+
29
+ def all_features():
30
+ return [Info()]
@@ -13,8 +13,9 @@ Feature for testing the presence of MACAULAY2
13
13
  # *****************************************************************************
14
14
 
15
15
  import subprocess
16
- from . import Executable
16
+ from . import Executable, PythonModule
17
17
  from . import FeatureTestResult
18
+ from .join_feature import JoinFeature
18
19
 
19
20
  class Macaulay2(Executable):
20
21
  r"""
@@ -24,7 +25,7 @@ class Macaulay2(Executable):
24
25
 
25
26
  sage: from sage.features.macaulay2 import Macaulay2
26
27
  sage: Macaulay2().is_present() # optional - macaulay2
27
- FeatureTestResult('macaulay2', True)
28
+ FeatureTestResult('macaulay2_executable', True)
28
29
  """
29
30
  def __init__(self):
30
31
  r"""
@@ -34,9 +35,12 @@ class Macaulay2(Executable):
34
35
  sage: isinstance(Macaulay2(), Macaulay2)
35
36
  True
36
37
  """
37
- Executable.__init__(self, "macaulay2", executable='M2',
38
+ Executable.__init__(self, "macaulay2_executable", executable='M2',
38
39
  spkg='macaulay2')
39
40
 
40
41
 
41
42
  def all_features():
42
- return [Macaulay2()]
43
+ return [JoinFeature("macaulay2",
44
+ (Macaulay2(),
45
+ PythonModule('sage.interfaces.macaulay2')),
46
+ spkg='sagemath_macaulay2')]
@@ -955,6 +955,7 @@ class sage__rings__number_field(JoinFeature):
955
955
  Doctests that construct algebraic number fields should be marked ``# needs sage.rings.number_field``::
956
956
 
957
957
  sage: # needs sage.rings.number_field
958
+ sage: x = polygen(ZZ, 'x')
958
959
  sage: K.<cuberoot2> = NumberField(x^3 - 2)
959
960
  sage: L.<cuberoot3> = K.extension(x^3 - 3)
960
961
  sage: S.<sqrt2> = L.extension(x^2 - 2); S
@@ -26,6 +26,7 @@ Functions and classes
26
26
  ---------------------
27
27
  """
28
28
 
29
+ import platform
29
30
  from sage.structure.sage_object import SageObject
30
31
 
31
32
 
@@ -66,7 +67,7 @@ def default_viewer(viewer=None):
66
67
  PDF_VIEWER = BROWSER
67
68
  PNG_VIEWER = BROWSER
68
69
 
69
- elif os.uname()[0] == 'Darwin':
70
+ elif platform.system() == 'Darwin':
70
71
  # Simple on OS X, since there is an open command that opens
71
72
  # anything, using the user's preferences.
72
73
  BROWSER = 'open -W'
@@ -1,6 +1,6 @@
1
1
  # sage_setup: distribution = sagemath-environment
2
2
  # Sage version information for Python scripts
3
3
  # This file is auto-generated by the sage-update-version script, do not edit!
4
- version = '10.4.61'
5
- date = '2024-11-15'
6
- banner = 'passagemath version 10.4.61, Release Date: 2024-11-15'
4
+ version = '10.4.62'
5
+ date = '2024-11-17'
6
+ banner = 'passagemath version 10.4.62, Release Date: 2024-11-17'
@@ -1 +0,0 @@
1
- 10.4.61