Remove custom environment tests

pysr/_cli/main.py

@@ -2,13 +2,7 @@ import warnings
 
 import click
 
-from ..test import (
-    get_runtests_cli,
-    runtests,
-    runtests_env,
-    runtests_jax,
-    runtests_torch,
-)
+from ..test import get_runtests_cli, runtests, runtests_jax, runtests_torch
 
 
 @click.group("pysr")
@@ -48,7 +42,7 @@ def _install(julia_project, quiet, precompile):
     )
 
 
-TEST_OPTIONS = {"main", "env", "jax", "torch", "cli"}
+TEST_OPTIONS = {"main", "jax", "torch", "cli"}
 
 
 @pysr.command("test", help="Run PySR test suite.")
@@ -56,7 +50,7 @@ TEST_OPTIONS = {"main", "env", "jax", "torch", "cli"}
 def _tests(tests):
     """Run part of the PySR test suite.
 
-    Choose from main, env, jax, torch, and cli.
+    Choose from main, jax, torch, and cli.
     """
     if len(tests) == 0:
         raise click.UsageError(
@@ -70,8 +64,6 @@ def _tests(tests):
             if test in TEST_OPTIONS:
                 if test == "main":
                     runtests()
-                elif test == "env":
-                    runtests_env()
                 elif test == "jax":
                     runtests_jax()
                 elif test == "torch":

pysr/sr.py

@@ -531,11 +531,6 @@ class PySRRegressor(MultiOutputMixin, RegressorMixin, BaseEstimator):
     delete_tempfiles : bool
         Whether to delete the temporary files after finishing.
         Default is `True`.
-    julia_project : str
-        A Julia environment location containing a Project.toml
-        (and potentially the source code for SymbolicRegression.jl).
-        Default gives the Python package directory, where a
-        Project.toml file should be present from the install.
     update: bool
         Whether to automatically update Julia packages when `fit` is called.
         You should make sure that PySR is up-to-date itself first, as
@@ -740,7 +735,6 @@ class PySRRegressor(MultiOutputMixin, RegressorMixin, BaseEstimator):
         temp_equation_file: bool = False,
         tempdir: Optional[str] = None,
         delete_tempfiles: bool = True,
-        julia_project: Optional[str] = None,
         update: bool = False,
         output_jax_format: bool = False,
         output_torch_format: bool = False,
@@ -873,6 +867,18 @@ class PySRRegressor(MultiOutputMixin, RegressorMixin, BaseEstimator):
                         f"Ignoring parameter; please pass {k} during the call to fit instead.",
                         FutureWarning,
                     )
+                elif k == "julia_project":
+                    warnings.warn(
+                        "The `julia_project` parameter has been deprecated. To use a custom "
+                        "julia project, you should instead:\n"
+                        "    1. Clone the PySR repository.\n"
+                        "    2. Modify the `pysr/juliapkg.json` file's specification of the "
+                        'SymbolicRegression.jl package to have `"dev": true` and `"path": '
+                        '"/path/to/custom/project"`.\n'
+                        "    3. Install this PySR package with `pip install -e .` from the "
+                        "PySR repository root.\n"
+                        "You should now be able to use the custom julia project.",
+                    )
                 else:
                     raise TypeError(
                         f"{k} is not a valid keyword argument for PySRRegressor."

pysr/test/__init__.py

@@ -1,12 +1,10 @@
 from .test import runtests
 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",
     "get_runtests_cli",

pysr/test/test_env.py

@@ -1,58 +0,0 @@
-"""Contains tests for creating and initializing custom Julia projects."""
-
-import os
-import unittest
-from tempfile import TemporaryDirectory
-
-from .. import julia_helpers
-
-
-class TestJuliaProject(unittest.TestCase):
-    """Various tests for working with Julia projects."""
-
-    def test_custom_shared_env(self):
-        """Test that we can use PySR in a custom shared env."""
-        with TemporaryDirectory() as tmpdir:
-            # Create a temp depot to store julia packages (and our custom env)
-            Main = julia_helpers.init_julia()
-
-            # Set up env:
-            if "JULIA_DEPOT_PATH" not in os.environ:
-                old_env = None
-                os.environ["JULIA_DEPOT_PATH"] = tmpdir
-            else:
-                old_env = os.environ["JULIA_DEPOT_PATH"]
-                os.environ[
-                    "JULIA_DEPOT_PATH"
-                ] = f"{tmpdir}:{os.environ['JULIA_DEPOT_PATH']}"
-            Main.eval(
-                f'pushfirst!(DEPOT_PATH, "{julia_helpers._escape_filename(tmpdir)}")'
-            )
-            test_env_name = "@pysr_test_env"
-            julia_helpers.install(julia_project=test_env_name)
-            Main = julia_helpers.init_julia(julia_project=test_env_name)
-
-            # Try to use env:
-            Main.eval("using SymbolicRegression")
-            Main.eval("using Pkg")
-
-            # Assert we actually loaded it:
-            cur_project_dir = Main.eval("splitdir(dirname(Base.active_project()))[1]")
-            potential_shared_project_dirs = Main.eval("Pkg.envdir(DEPOT_PATH[1])")
-            self.assertEqual(cur_project_dir, potential_shared_project_dirs)
-
-            # Clean up:
-            Main.eval("pop!(DEPOT_PATH)")
-            if old_env is None:
-                del os.environ["JULIA_DEPOT_PATH"]
-            else:
-                os.environ["JULIA_DEPOT_PATH"] = old_env
-
-
-def runtests():
-    """Run all tests in test_env.py."""
-    loader = unittest.TestLoader()
-    suite = unittest.TestSuite()
-    suite.addTests(loader.loadTestsFromTestCase(TestJuliaProject))
-    runner = unittest.TextTestRunner()
-    return runner.run(suite)