We can tolerate PyPy now... (#1139)

Fixes #661 --------- Co-authored-by: Juan Mauricio Matera <[email protected]>
Mathics3 · Oct 21, 2024 · e7ca026 · e7ca026
1 parent eb831c2
commit e7ca026
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/mathics/builtin/drawing/plot.py b/mathics/builtin/drawing/plot.py
@@ -316,7 +316,7 @@ def eval(self, points, evaluation: Evaluation, options: dict):
         all_points = (
             points.value
             if hasattr(points, "value") and points.value is not None
-            else eval_N(points, evaluation).to_python()
+            else eval_N(points, evaluation).to_python()  # TODO: force tuple-ness?
         )
 
         # FIXME: arrange for self to have a .symbolname property or attribute

diff --git a/mathics/builtin/scipy_utils/integrators.py b/mathics/builtin/scipy_utils/integrators.py
@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 
 from mathics.core.builtin import check_requires_list
-from mathics.core.util import IS_PYPY
 
-if IS_PYPY or not check_requires_list(["scipy", "numpy"]):
+if not check_requires_list(["scipy", "numpy"]):
     raise ImportError
 
 import numpy as np

diff --git a/mathics/builtin/scipy_utils/optimizers.py b/mathics/builtin/scipy_utils/optimizers.py
@@ -5,10 +5,9 @@
 from mathics.core.evaluation import Evaluation
 from mathics.core.expression import Expression
 from mathics.core.systemsymbols import SymbolAutomatic, SymbolFailed, SymbolInfinity
-from mathics.core.util import IS_PYPY
 from mathics.eval.nevaluator import eval_N
 
-if IS_PYPY or not check_requires_list(["scipy", "numpy"]):
+if not check_requires_list(["scipy", "numpy"]):
     raise ImportError
 
 

diff --git a/mathics/eval/drawing/plot.py b/mathics/eval/drawing/plot.py
@@ -134,7 +134,8 @@ def quiet_f(*args):
 
 
 def eval_ListPlot(
-    plot_groups: list,
+    # TODO: plot_groups should be a tuple only?
+    plot_groups: Union[list, tuple],
     x_range: list,
     y_range: list,
     is_discrete_plot: bool,

diff --git a/mathics/eval/nevaluator.py b/mathics/eval/nevaluator.py
@@ -29,7 +29,7 @@ def eval_N(
     expression: BaseElement,
     evaluation: Evaluation,
     prec: BaseElement = SymbolMachinePrecision,
-) -> BaseElement:
+) -> Optional[BaseElement]:
     """
     Equivalent to Expression(SymbolN, expression).evaluate(evaluation)
     """