Spaces:
Running
Running
MilesCranmer
commited on
Commit
•
09bfff6
1
Parent(s):
5df1590
Revert GitHub-based registry for backend (#587)
Browse files* Revert "Fix which PySR gets installed in dev test"
This reverts commit 7ba43b5eef71b145ae19c685866e589aae5bab15.
* Revert "Update CI for new source"
This reverts commit a3b6f7f96b0bb07ed9e37d34bd681ea366bb84b1.
* Revert "Bump backend version and switch to GitHub version"
This reverts commit 69b4db6e07f893590a11889c5050ef69516735dd.
* Revert git-based backend
* Move pip install to end of dev test
* Undo revert in dev test
.github/workflows/update_backend_version.py
CHANGED
@@ -20,7 +20,7 @@ with open(juliapkg_json) as f:
|
|
20 |
major, minor, patch, *dev = pyproject_data["project"]["version"].split(".")
|
21 |
pyproject_data["project"]["version"] = f"{major}.{minor}.{int(patch)+1}"
|
22 |
|
23 |
-
juliapkg_data["packages"]["SymbolicRegression"]["
|
24 |
|
25 |
with open(pyproject_toml, "w") as toml_file:
|
26 |
toml_file.write(tomlkit.dumps(pyproject_data))
|
|
|
20 |
major, minor, patch, *dev = pyproject_data["project"]["version"].split(".")
|
21 |
pyproject_data["project"]["version"] = f"{major}.{minor}.{int(patch)+1}"
|
22 |
|
23 |
+
juliapkg_data["packages"]["SymbolicRegression"]["version"] = f"={new_backend_version}"
|
24 |
|
25 |
with open(pyproject_toml, "w") as toml_file:
|
26 |
toml_file.write(tomlkit.dumps(pyproject_data))
|
pyproject.toml
CHANGED
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|
4 |
|
5 |
[project]
|
6 |
name = "pysr"
|
7 |
-
version = "0.18.
|
8 |
authors = [
|
9 |
{name = "Miles Cranmer", email = "[email protected]"},
|
10 |
]
|
|
|
4 |
|
5 |
[project]
|
6 |
name = "pysr"
|
7 |
+
version = "0.18.1"
|
8 |
authors = [
|
9 |
{name = "Miles Cranmer", email = "[email protected]"},
|
10 |
]
|
pysr/juliapkg.json
CHANGED
@@ -3,8 +3,7 @@
|
|
3 |
"packages": {
|
4 |
"SymbolicRegression": {
|
5 |
"uuid": "8254be44-1295-4e6a-a16d-46603ac705cb",
|
6 |
-
"
|
7 |
-
"rev": "v0.24.1"
|
8 |
},
|
9 |
"Serialization": {
|
10 |
"uuid": "9e88b42a-f829-5b0c-bbe9-9e923198166b",
|
|
|
3 |
"packages": {
|
4 |
"SymbolicRegression": {
|
5 |
"uuid": "8254be44-1295-4e6a-a16d-46603ac705cb",
|
6 |
+
"version": "=0.24.1"
|
|
|
7 |
},
|
8 |
"Serialization": {
|
9 |
"uuid": "9e88b42a-f829-5b0c-bbe9-9e923198166b",
|
pysr/test/test_dev_pysr.dockerfile
CHANGED
@@ -35,10 +35,10 @@ RUN mkdir /pysr/pysr/test
|
|
35 |
|
36 |
# Now, we create a custom version of SymbolicRegression.jl
|
37 |
# First, we get the version from juliapkg.json:
|
38 |
-
RUN python3 -c 'import json; print(json.load(open("/pysr/pysr/juliapkg.json", "r"))["packages"]["SymbolicRegression"]["
|
39 |
|
40 |
-
# Remove
|
41 |
-
RUN cat /pysr/sr_version | sed 's
|
42 |
|
43 |
# Now, we check out the version of SymbolicRegression.jl that PySR is using:
|
44 |
RUN git clone -b "v$(cat /pysr/sr_version_processed)" --single-branch https://github.com/MilesCranmer/SymbolicRegression.jl /srjl
|
|
|
35 |
|
36 |
# Now, we create a custom version of SymbolicRegression.jl
|
37 |
# First, we get the version from juliapkg.json:
|
38 |
+
RUN python3 -c 'import json; print(json.load(open("/pysr/pysr/juliapkg.json", "r"))["packages"]["SymbolicRegression"]["version"])' > /pysr/sr_version
|
39 |
|
40 |
+
# Remove any = or ^ or ~ from the version:
|
41 |
+
RUN cat /pysr/sr_version | sed 's/[\^=~]//g' > /pysr/sr_version_processed
|
42 |
|
43 |
# Now, we check out the version of SymbolicRegression.jl that PySR is using:
|
44 |
RUN git clone -b "v$(cat /pysr/sr_version_processed)" --single-branch https://github.com/MilesCranmer/SymbolicRegression.jl /srjl
|