Revert "fix: try moving to python juliapkg.json"

This reverts commit 07a359d.
MilesCranmer · May 4, 2024 · 5824cd8 · 5824cd8
1 parent 84bbcf7
commit 5824cd8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -22,6 +22,7 @@ dynamic = ["dependencies"]
 [tool.setuptools]
 packages = ["pysr", "pysr._cli", "pysr.test"]
 include-package-data = false
+package-data = {pysr = ["juliapkg.json"]}
 
 [tool.setuptools.dynamic]
 dependencies = {file = "requirements.txt"}

diff --git a/pysr/__init__.py b/pysr/__init__.py
@@ -1,11 +1,3 @@
-import juliapkg
-
-juliapkg.require_julia("~1.6.7, ~1.7, ~1.8, ~1.9, =1.10.0, ^1.10.3")
-juliapkg.add(
-    "SymbolicRegression", "8254be44-1295-4e6a-a16d-46603ac705cb", version="=0.24.4"
-)
-juliapkg.add("Serialization", "9e88b42a-f829-5b0c-bbe9-9e923198166b", version="1")
-
 # This must be imported as early as possible to prevent
 # library linking issues caused by numpy/pytorch/etc. importing
 # old libraries:
@@ -26,6 +18,7 @@
     "sklearn_monkeypatch",
     "sympy2jax",
     "sympy2torch",
+    "Problem",
     "install",
     "PySRRegressor",
     "best",

diff --git a/pysr/juliapkg.json b/pysr/juliapkg.json
@@ -0,0 +1,13 @@
+{
+    "julia": "~1.6.7, ~1.7, ~1.8, ~1.9, =1.10.0, ^1.10.3",
+    "packages": {
+        "SymbolicRegression": {
+            "uuid": "8254be44-1295-4e6a-a16d-46603ac705cb",
+            "version": "=0.24.4"
+        },
+        "Serialization": {
+            "uuid": "9e88b42a-f829-5b0c-bbe9-9e923198166b",
+            "version": "1"
+        }
+    }
+}
diff --git a/requirements.txt b/requirements.txt
@@ -3,7 +3,6 @@ pandas>=0.21.0,<3.0.0
 numpy>=1.13.0,<2.0.0
 scikit_learn>=1.0.0,<2.0.0
 juliacall==0.9.20
-juliapkg==0.1.11
 click>=7.0.0,<9.0.0
 setuptools>=50.0.0
 typing_extensions>=4.0.0,<5.0.0; python_version < "3.8"