MilesCranmer commited on
Commit
07a359d
1 Parent(s): f8e5f79

fix: try moving to python juliapkg.json

Browse files
Files changed (4) hide show
  1. pyproject.toml +0 -1
  2. pysr/__init__.py +8 -1
  3. pysr/juliapkg.json +0 -13
  4. requirements.txt +1 -0
pyproject.toml CHANGED
@@ -22,7 +22,6 @@ dynamic = ["dependencies"]
22
  [tool.setuptools]
23
  packages = ["pysr", "pysr._cli", "pysr.test"]
24
  include-package-data = false
25
- package-data = {pysr = ["juliapkg.json"]}
26
 
27
  [tool.setuptools.dynamic]
28
  dependencies = {file = "requirements.txt"}
 
22
  [tool.setuptools]
23
  packages = ["pysr", "pysr._cli", "pysr.test"]
24
  include-package-data = false
 
25
 
26
  [tool.setuptools.dynamic]
27
  dependencies = {file = "requirements.txt"}
pysr/__init__.py CHANGED
@@ -1,3 +1,11 @@
 
 
 
 
 
 
 
 
1
  # This must be imported as early as possible to prevent
2
  # library linking issues caused by numpy/pytorch/etc. importing
3
  # old libraries:
@@ -18,7 +26,6 @@ __all__ = [
18
  "sklearn_monkeypatch",
19
  "sympy2jax",
20
  "sympy2torch",
21
- "Problem",
22
  "install",
23
  "PySRRegressor",
24
  "best",
 
1
+ import juliapkg
2
+
3
+ juliapkg.require_julia("~1.6.7, ~1.7, ~1.8, ~1.9, =1.10.0, ^1.10.3")
4
+ juliapkg.add(
5
+ "SymbolicRegression", "8254be44-1295-4e6a-a16d-46603ac705cb", version="=0.24.4"
6
+ )
7
+ juliapkg.add("Serialization", "9e88b42a-f829-5b0c-bbe9-9e923198166b", version="1")
8
+
9
  # This must be imported as early as possible to prevent
10
  # library linking issues caused by numpy/pytorch/etc. importing
11
  # old libraries:
 
26
  "sklearn_monkeypatch",
27
  "sympy2jax",
28
  "sympy2torch",
 
29
  "install",
30
  "PySRRegressor",
31
  "best",
pysr/juliapkg.json DELETED
@@ -1,13 +0,0 @@
1
- {
2
- "julia": "~1.6.7, ~1.7, ~1.8, ~1.9, =1.10.0, ^1.10.3",
3
- "packages": {
4
- "SymbolicRegression": {
5
- "uuid": "8254be44-1295-4e6a-a16d-46603ac705cb",
6
- "version": "=0.24.4"
7
- },
8
- "Serialization": {
9
- "uuid": "9e88b42a-f829-5b0c-bbe9-9e923198166b",
10
- "version": "1"
11
- }
12
- }
13
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
requirements.txt CHANGED
@@ -3,6 +3,7 @@ pandas>=0.21.0,<3.0.0
3
  numpy>=1.13.0,<2.0.0
4
  scikit_learn>=1.0.0,<2.0.0
5
  juliacall==0.9.20
 
6
  click>=7.0.0,<9.0.0
7
  setuptools>=50.0.0
8
  typing_extensions>=4.0.0,<5.0.0; python_version < "3.8"
 
3
  numpy>=1.13.0,<2.0.0
4
  scikit_learn>=1.0.0,<2.0.0
5
  juliacall==0.9.20
6
+ juliapkg==0.1.11
7
  click>=7.0.0,<9.0.0
8
  setuptools>=50.0.0
9
  typing_extensions>=4.0.0,<5.0.0; python_version < "3.8"