Merge branch 'master' into gui

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pysr"
-version = "0.19.0"
+version = "0.19.1"
 authors = [
     {name = "Miles Cranmer", email = "[email protected]"},
 ]

pysr/__init__.py

@@ -18,7 +18,6 @@ __all__ = [
     "sklearn_monkeypatch",
     "sympy2jax",
     "sympy2torch",
-    "Problem",
     "install",
     "PySRRegressor",
     "best",

pysr/export_jax.py

@@ -1,5 +1,5 @@
 import numpy as np  # noqa: F401
-import sympy
+import sympy  # type: ignore
 
 # Special since need to reduce arguments.
 MUL = 0

pysr/export_latex.py

@@ -3,8 +3,8 @@
 from typing import List, Optional, Tuple
 
 import pandas as pd
-import sympy
-from sympy.printing.latex import LatexPrinter
+import sympy  # type: ignore
+from sympy.printing.latex import LatexPrinter  # type: ignore
 
 
 class PreciseLatexPrinter(LatexPrinter):

pysr/export_numpy.py

@@ -6,7 +6,7 @@ from typing import List, Union
 import numpy as np
 import pandas as pd
 from numpy.typing import NDArray
-from sympy import Expr, Symbol, lambdify
+from sympy import Expr, Symbol, lambdify  # type: ignore
 
 
 def sympy2numpy(eqn, sympy_symbols, *, selection=None):

pysr/export_sympy.py

@@ -2,7 +2,7 @@
 
 from typing import Callable, Dict, List, Optional
 
-import sympy
+import sympy  # type: ignore
 from sympy import sympify
 
 from .utils import ArrayLike

pysr/export_torch.py

@@ -4,7 +4,7 @@ import collections as co
 import functools as ft
 
 import numpy as np  # noqa: F401
-import sympy
+import sympy  # type: ignore
 
 
 def _reduce(fn):

pysr/test/test.py

@@ -1,3 +1,4 @@
+import importlib
 import os
 import pickle as pkl
 import tempfile
@@ -8,7 +9,7 @@ from pathlib import Path
 
 import numpy as np
 import pandas as pd
-import sympy
+import sympy  # type: ignore
 from sklearn.utils.estimator_checks import check_estimator
 
 from pysr import PySRRegressor, install, jl
@@ -892,7 +893,7 @@ class TestHelpMessages(unittest.TestCase):
 
         # More complex, and with error
         with self.assertRaises(TypeError) as cm:
-            model = PySRRegressor(ncyclesperiterationn=5)
+            PySRRegressor(ncyclesperiterationn=5)
 
         self.assertIn(
             "`ncyclesperiterationn` is not a valid keyword", str(cm.exception)
@@ -903,10 +904,18 @@ class TestHelpMessages(unittest.TestCase):
 
         # Farther matches (this might need to be changed)
         with self.assertRaises(TypeError) as cm:
-            model = PySRRegressor(operators=["+", "-"])
+            PySRRegressor(operators=["+", "-"])
 
         self.assertIn("`unary_operators`, `binary_operators`", str(cm.exception))
 
+    def test_issue_666(self):
+        # Try the equivalent of `from pysr import *`
+        pysr_module = importlib.import_module("pysr")
+        names_to_import = pysr_module.__all__
+
+        for name in names_to_import:
+            getattr(pysr_module, name)
+
 
 TRUE_PREAMBLE = "\n".join(
     [

pysr/test/test_jax.py

@@ -3,7 +3,7 @@ from functools import partial
 
 import numpy as np
 import pandas as pd
-import sympy
+import sympy  # type: ignore
 
 import pysr
 from pysr import PySRRegressor, sympy2jax
@@ -102,7 +102,7 @@ class TestJAX(unittest.TestCase):
         )
 
     def test_issue_656(self):
-        import sympy
+        import sympy  # type: ignore
 
         E_plus_x1 = sympy.exp(1) + sympy.symbols("x1")
         f, params = pysr.export_jax.sympy2jax(E_plus_x1, [sympy.symbols("x1")])

pysr/test/test_torch.py

@@ -2,7 +2,7 @@ import unittest
 
 import numpy as np
 import pandas as pd
-import sympy
+import sympy  # type: ignore
 
 import pysr
 from pysr import PySRRegressor, sympy2torch