Skip to content

Commit 09bfff6

Browse files
authored
Revert GitHub-based registry for backend (#587)
* Revert "Fix which PySR gets installed in dev test" This reverts commit 7ba43b5. * Revert "Update CI for new source" This reverts commit a3b6f7f. * Revert "Bump backend version and switch to GitHub version" This reverts commit 69b4db6. * Revert git-based backend * Move pip install to end of dev test * Undo revert in dev test
1 parent 5df1590 commit 09bfff6

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

.github/workflows/update_backend_version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
major, minor, patch, *dev = pyproject_data["project"]["version"].split(".")
2121
pyproject_data["project"]["version"] = f"{major}.{minor}.{int(patch)+1}"
2222

23-
juliapkg_data["packages"]["SymbolicRegression"]["rev"] = f"v{new_backend_version}"
23+
juliapkg_data["packages"]["SymbolicRegression"]["version"] = f"={new_backend_version}"
2424

2525
with open(pyproject_toml, "w") as toml_file:
2626
toml_file.write(tomlkit.dumps(pyproject_data))

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "pysr"
7-
version = "0.18.0"
7+
version = "0.18.1"
88
authors = [
99
{name = "Miles Cranmer", email = "[email protected]"},
1010
]

pysr/juliapkg.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"packages": {
44
"SymbolicRegression": {
55
"uuid": "8254be44-1295-4e6a-a16d-46603ac705cb",
6-
"url": "https://github.com/MilesCranmer/SymbolicRegression.jl",
7-
"rev": "v0.24.1"
6+
"version": "=0.24.1"
87
},
98
"Serialization": {
109
"uuid": "9e88b42a-f829-5b0c-bbe9-9e923198166b",

pysr/test/test_dev_pysr.dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ RUN mkdir /pysr/pysr/test
3535

3636
# Now, we create a custom version of SymbolicRegression.jl
3737
# 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"]["rev"])' > /pysr/sr_version
38+
RUN python3 -c 'import json; print(json.load(open("/pysr/pysr/juliapkg.json", "r"))["packages"]["SymbolicRegression"]["version"])' > /pysr/sr_version
3939

40-
# Remove v from the version:
41-
RUN cat /pysr/sr_version | sed 's/^v//g' > /pysr/sr_version_processed
40+
# Remove any = or ^ or ~ from the version:
41+
RUN cat /pysr/sr_version | sed 's/[\^=~]//g' > /pysr/sr_version_processed
4242

4343
# Now, we check out the version of SymbolicRegression.jl that PySR is using:
4444
RUN git clone -b "v$(cat /pysr/sr_version_processed)" --single-branch https://github.com/MilesCranmer/SymbolicRegression.jl /srjl

0 commit comments

Comments
 (0)