Merge pull request #935 from MilesCranmer/fix-beartype

fix: compat with python 3.8 by removing beartype

Author: MilesCranmer

environment.yml

@@ -9,5 +9,4 @@ dependencies:
   - scikit-learn>=1.0.0,<2.0.0
   - pyjuliacall>=0.9.24,<0.9.26
   - click>=7.0.0,<9.0.0
-  - beartype>=0.19,<0.22
   - typing-extensions>=4.0.0,<5.0.0

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pysr"
-version = "1.5.7"
+version = "1.5.8"
 authors = [
     {name = "Miles Cranmer", email = "miles.cranmer@gmail.com"},
 ]
@@ -24,13 +24,13 @@ dependencies = [
     "scikit_learn>=1.0.0,<2.0.0",
     "juliacall>=0.9.24,<0.9.26",
     "click>=7.0.0,<9.0.0",
-    "beartype>=0.19,<0.22",
     "typing-extensions>=4.0.0,<5.0.0",
 ]
 
 [project.optional-dependencies]
 dev = [
     "coverage>=7,<8",
+    "beartype>=0.19,<0.22",
     "ipykernel>=6,<7",
     "ipython>=8,<9",
     "jax[cpu]>=0.4,<0.6",

pysr/sr.py

@@ -19,7 +19,6 @@
 
 import numpy as np
 import pandas as pd
-from beartype.typing import List
 from numpy import ndarray
 from numpy.typing import NDArray
 from sklearn.base import BaseEstimator, MultiOutputMixin, RegressorMixin
@@ -70,6 +69,12 @@
 except ImportError:
     OLD_SKLEARN = True
 
+try:
+    from typing import List
+except ImportError:
+    from typing_extensions import List
+
+
 ALREADY_RAN = False
 
 pysr_logger = logging.getLogger(__name__)

pysr/utils.py

@@ -6,10 +6,14 @@
 from pathlib import Path
 from typing import Any, TypeVar, Union
 
-from beartype.typing import List
 from numpy import ndarray
 from sklearn.utils.validation import _check_feature_names_in  # type: ignore
 
+try:
+    from typing import List
+except ImportError:
+    from typing_extensions import List
+
 T = TypeVar("T", bound=Any)
 
 ArrayLike = Union[ndarray, List[T]]