WIP move `python -m pysr.test` call to click interface

pysr/_cli/main.py

@@ -2,6 +2,14 @@ import warnings
 
 import click
 
+from ..test import (
+    get_runtests_cli,
+    runtests,
+    runtests_env,
+    runtests_jax,
+    runtests_torch,
+)
+
 
 @click.group("pysr")
 @click.pass_context
@@ -38,3 +46,34 @@ def _install(julia_project, quiet, precompile):
     warnings.warn(
         "This command is deprecated. Julia dependencies are now installed at first import."
     )
+
+
+TEST_OPTIONS = {"main", "env", "jax", "torch", "cli"}
+
+
+@pysr.command("test", help="Run PySR test suite.")
+@click.argument("tests", nargs=-1, help="Choose from " + ", ".join(TEST_OPTIONS) + ".")
+def _tests(tests):
+    if len(tests) == 0:
+        raise click.UsageError(
+            "At least one test must be specified. "
+            + "The following are available: "
+            + ", ".join(TEST_OPTIONS)
+            + "."
+        )
+    else:
+        for test in tests:
+            if test in TEST_OPTIONS:
+                if test == "main":
+                    runtests()
+                elif test == "env":
+                    runtests_env()
+                elif test == "jax":
+                    runtests_jax()
+                elif test == "torch":
+                    runtests_torch()
+                elif test == "cli":
+                    runtests_cli = get_runtests_cli()
+                    runtests_cli()
+            else:
+                warnings.warn(f"Invalid test {test}. Skipping.")

pysr/julia_helpers.py

@@ -38,11 +38,6 @@ from juliacall import convert as jl_convert
 jl.seval("using Serialization: Serialization")
 jl.seval("using PythonCall: PythonCall")
 
-juliainfo = None
-julia_initialized = False
-julia_kwargs_at_initialization = None
-julia_activated_env = None
-
 
 def _escape_filename(filename):
     """Turn a path into a string with correctly escaped backslashes."""

pysr/test/__init__.py

@@ -1,7 +1,13 @@
 from .test import runtests
-from .test_cli import runtests as runtests_cli
+from .test_cli import get_runtests as get_runtests_cli
 from .test_env import runtests as runtests_env
 from .test_jax import runtests as runtests_jax
 from .test_torch import runtests as runtests_torch
 
-__all__ = ["runtests", "runtests_env", "runtests_jax", "runtests_torch", "runtests_cli"]
+__all__ = [
+    "runtests",
+    "runtests_env",
+    "runtests_jax",
+    "runtests_torch",
+    "get_runtests_cli",
+]

pysr/test/__main__.py

@@ -1,6 +1,5 @@
 """CLI for running PySR's test suite."""
 import argparse
-import os
 
 from . import *
 
@@ -11,33 +10,6 @@ if __name__ == "__main__":
     parser.add_argument(
         "test",
         nargs="*",
-        help="Test to run. One or more of 'main', 'env', 'jax', 'torch', 'cli'.",
+        help="DEPRECATED. Use `python -m pysr test [tests...]` instead."
+        # help="Test to run. One or more of 'main', 'env', 'jax', 'torch', 'cli'.",
     )
-
-    # Parse args:
-    args = parser.parse_args()
-    tests = args.test
-
-    if len(tests) == 0:
-        # Raise help message:
-        parser.print_help()
-        raise SystemExit(1)
-
-    # Run tests:
-    for test in tests:
-        if test in {"main", "env", "jax", "torch", "cli"}:
-            cur_dir = os.path.dirname(os.path.abspath(__file__))
-            print(f"Running test from {cur_dir}")
-            if test == "main":
-                runtests()
-            elif test == "env":
-                runtests_env()
-            elif test == "jax":
-                runtests_jax()
-            elif test == "torch":
-                runtests_torch()
-            elif test == "cli":
-                runtests_cli()
-        else:
-            parser.print_help()
-            raise SystemExit(1)

pysr/test/test_cli.py

@@ -2,58 +2,62 @@ import unittest
 
 from click import testing as click_testing
 
-from .._cli.main import pysr
-
-
-class TestCli(unittest.TestCase):
-    # TODO: Include test for custom project here.
-    def setUp(self):
-        self.cli_runner = click_testing.CliRunner()
-
-    def test_help_on_all_commands(self):
-        expected = "\n".join(
-            [
-                "Usage: pysr [OPTIONS] COMMAND [ARGS]...",
-                "",
-                "Options:",
-                "  --help  Show this message and exit.",
-                "",
-                "Commands:",
-                "  install  Install Julia dependencies for PySR.",
-                "",
-            ]
-        )
-        result = self.cli_runner.invoke(pysr, ["--help"])
-        self.assertEqual(expected, result.output)
-        self.assertEqual(0, result.exit_code)
-
-    def test_help_on_install(self):
-        expected = "\n".join(
-            [
-                "Usage: pysr install [OPTIONS]",
-                "",
-                "  Install Julia dependencies for PySR.",
-                "",
-                "Options:",
-                "  -p, --project PROJECT_DIRECTORY",
-                "                                  Install in a specific Julia project (e.g., a",
-                "                                  local copy of SymbolicRegression.jl).",
-                "  -q, --quiet                     Disable logging.",
-                "  --precompile                    Force precompilation of Julia libraries.",
-                "  --no-precompile                 Disable precompilation.",
-                "  --help                          Show this message and exit.",
-                "",
-            ]
-        )
-        result = self.cli_runner.invoke(pysr, ["install", "--help"])
-        self.assertEqual(expected, result.output)
-        self.assertEqual(0, result.exit_code)
-
-
-def runtests():
-    """Run all tests in cliTest.py."""
-    loader = unittest.TestLoader()
-    suite = unittest.TestSuite()
-    suite.addTests(loader.loadTestsFromTestCase(TestCli))
-    runner = unittest.TextTestRunner()
-    return runner.run(suite)
+
+def get_runtests():
+    # Lazy load to avoid circular imports.
+
+    from .._cli.main import pysr
+
+    class TestCli(unittest.TestCase):
+        # TODO: Include test for custom project here.
+        def setUp(self):
+            self.cli_runner = click_testing.CliRunner()
+
+        def test_help_on_all_commands(self):
+            expected = "\n".join(
+                [
+                    "Usage: pysr [OPTIONS] COMMAND [ARGS]...",
+                    "",
+                    "Options:",
+                    "  --help  Show this message and exit.",
+                    "",
+                    "Commands:",
+                    "  install  Install Julia dependencies for PySR.",
+                    "",
+                ]
+            )
+            result = self.cli_runner.invoke(pysr, ["--help"])
+            self.assertEqual(expected, result.output)
+            self.assertEqual(0, result.exit_code)
+
+        def test_help_on_install(self):
+            expected = "\n".join(
+                [
+                    "Usage: pysr install [OPTIONS]",
+                    "",
+                    "  Install Julia dependencies for PySR.",
+                    "",
+                    "Options:",
+                    "  -p, --project PROJECT_DIRECTORY",
+                    "                                  Install in a specific Julia project (e.g., a",
+                    "                                  local copy of SymbolicRegression.jl).",
+                    "  -q, --quiet                     Disable logging.",
+                    "  --precompile                    Force precompilation of Julia libraries.",
+                    "  --no-precompile                 Disable precompilation.",
+                    "  --help                          Show this message and exit.",
+                    "",
+                ]
+            )
+            result = self.cli_runner.invoke(pysr, ["install", "--help"])
+            self.assertEqual(expected, result.output)
+            self.assertEqual(0, result.exit_code)
+
+    def runtests():
+        """Run all tests in cliTest.py."""
+        loader = unittest.TestLoader()
+        suite = unittest.TestSuite()
+        suite.addTests(loader.loadTestsFromTestCase(TestCli))
+        runner = unittest.TextTestRunner()
+        return runner.run(suite)
+
+    return runtests