Merge pull request #202 from MilesCranmer/fix-conda-forge

Fix conda forge installs

Author: MilesCranmer

.github/workflows/CI_conda_forge.yml

@@ -1,6 +1,6 @@
 name: conda-forge
 
-# This CI tries the conda-forge version of PYSR
+# This CI tries the conda-forge version of PySR
 
 on:
   schedule:
@@ -33,12 +33,11 @@ jobs:
           auto-activate-base: true
           python-version: ${{ matrix.python-version }}
           activate-environment: test
-          use-mamba: ${{ matrix.use-mamba }}
       - name: "Install pysr with mamba"
         run: conda activate test && mamba install pysr
         if: ${{ matrix.use-mamba }}
       - name: "Install pysr with conda"
         run: conda activate test && conda install pysr
         if: ${{ !matrix.use-mamba }}
       - name: "Run tests"
-        run: conda activate test && python3 -m unittest test.test && python3 -m unittest test.test_env
+        run: conda activate test && python3 -m unittest test.test

pysr/sr.py

@@ -523,8 +523,11 @@ class PySRRegressor(MultiOutputMixin, RegressorMixin, BaseEstimator):
         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.
-        Default is `True`.
+        Whether to automatically update Julia packages when `fit` is called.
+        You should make sure that PySR is up-to-date itself first, as
+        the packaged Julia packages may not necessarily include all
+        updated dependencies.
+        Default is `False`.
     output_jax_format : bool
         Whether to create a 'jax_format' column in the output,
         containing jax-callable functions and the default parameters in
@@ -700,7 +703,7 @@ def __init__(
         tempdir=None,
         delete_tempfiles=True,
         julia_project=None,
-        update=True,
+        update=False,
         output_jax_format=False,
         output_torch_format=False,
         extra_sympy_mappings=None,
@@ -1473,7 +1476,10 @@ def _run(self, X, y, mutated_params, weights, seed):
                     Main.eval(f"Pkg.resolve({io_arg})")
                 except (JuliaError, RuntimeError) as e:
                     raise ImportError(_import_error_string(julia_project)) from e
-            Main.eval("using SymbolicRegression")
+            try:
+                Main.eval("using SymbolicRegression")
+            except (JuliaError, RuntimeError) as e:
+                raise ImportError(_import_error_string(julia_project)) from e
 
             Main.plus = Main.eval("(+)")
             Main.sub = Main.eval("(-)")

pysr/version.py

@@ -1,2 +1,2 @@
-__version__ = "0.11.3"
+__version__ = "0.11.4"
 __symbolic_regression_jl_version__ = "0.12.2"