Merge branch 'master' into arithmetic_refactor

Mathics3 · Jul 20, 2023 · 2d2a37a · 2d2a37a
2 parents b3119c5 + 8a75f8f
commit 2d2a37a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/mathics/doc/latex/doc2latex.py b/mathics/doc/latex/doc2latex.py
@@ -30,6 +30,7 @@
 import mathics
 from mathics import __version__, settings, version_string
 from mathics.core.definitions import Definitions
+from mathics.core.load_builtin import import_and_load_builtins
 from mathics.doc.latex_doc import LaTeXMathicsDocumentation
 from mathics.eval.pymathics import PyMathicsLoadException, eval_LoadModule
 
@@ -172,15 +173,17 @@ def main():
         dest="chapters",
         metavar="CHAPTER",
         help="only test CHAPTER(s). "
-        "You can list multiple chapters by adding a comma (and no space) in between chapter names.",
+        "You can list multiple chapters by adding a comma (and no space) in between "
+        "chapter names.",
     )
     parser.add_argument(
         "--sections",
         "-s",
         dest="sections",
         metavar="SECTION",
         help="only test SECTION(s). "
-        "You can list multiple chapters by adding a comma (and no space) in between chapter names.",
+        "You can list multiple chapters by adding a comma (and no space) in between "
+        "chapter names.",
     )
     parser.add_argument(
         "--load-module",
@@ -210,6 +213,9 @@ def main():
 
     # LoadModule Mathics3 modules to pull in modules, and
     # their docstrings
+
+    import_and_load_builtins()
+
     if args.pymathics:
         definitions = Definitions(add_builtin=True)
         for module_name in args.pymathics.split(","):

diff --git a/setup.py b/setup.py
@@ -52,7 +52,7 @@
 INSTALL_REQUIRES += [
     "numpy<=1.24",
     "llvmlite",
-    "sympy>=1.8, < 1.12",
+    "sympy>=1.8",
     # Pillow 9.1.0 supports BigTIFF with big-endian byte order.
     # ExampleData image hedy.tif is in this format.
     # Pillow 9.2 handles sunflowers.jpg

diff --git a/test/builtin/calculus/test_solve.py b/test/builtin/calculus/test_solve.py
@@ -13,13 +13,13 @@ def test_solve():
         # the test to fail.
         (None, None, None),
         (
-            "Solve[{(7+x)*ma == 167, (5+x)*mb == 167, (7+5)*(ma+mb) == 334}, {ma, mb, x}]",
+            "Solve[{(7+x)*ma == 167, (5+x)*mb == 167, (7+5)*(ma+mb) == 334}, {ma, mb, x}]//Sort",
             "{{ma -> 1169 / 12 - 167 Sqrt[37] / 12, mb -> -835 / 12 + 167 Sqrt[37] / 12, x -> Sqrt[37]}, {ma -> 1169 / 12 + 167 Sqrt[37] / 12, mb -> -835 / 12 - 167 Sqrt[37] / 12, x -> -Sqrt[37]}}",
             "Issue63",
         ),
         (
-            "Solve[{(7+x)*ma == 167, (5+x)*mb == 167, (7+5)*(ma+mb) == 334}, {x, ma, mb}]",
-            "{{x -> -Sqrt[37], ma -> 1169 / 12 + 167 Sqrt[37] / 12, mb -> -835 / 12 - 167 Sqrt[37] / 12}, {x -> Sqrt[37], ma -> 1169 / 12 - 167 Sqrt[37] / 12, mb -> -835 / 12 + 167 Sqrt[37] / 12}}",
+            "Solve[{(7+x)*ma == 167, (5+x)*mb == 167, (7+5)*(ma+mb) == 334}, {x, ma, mb}]//Sort",
+            "{{x -> Sqrt[37], ma -> 1169 / 12 - 167 Sqrt[37] / 12, mb -> -835 / 12 + 167 Sqrt[37] / 12},{x -> -Sqrt[37], ma -> 1169 / 12 + 167 Sqrt[37] / 12, mb -> -835 / 12 - 167 Sqrt[37] / 12}}",
             "Issue 208",
         ),
         (