From 09bfff6a4599244e2653cdebf70885c48ad9d864 Mon Sep 17 00:00:00 2001
From: Miles Cranmer <miles.cranmer@gmail.com>
Date: Tue, 26 Mar 2024 18:23:21 +0100
Subject: [PATCH] Revert GitHub-based registry for backend (#587)

* 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 | 2 +-
 pyproject.toml                              | 2 +-
 pysr/juliapkg.json                          | 3 +--
 pysr/test/test_dev_pysr.dockerfile          | 6 +++---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/update_backend_version.py b/.github/workflows/update_backend_version.py
index 5a0002010..696da9f50 100644
--- a/.github/workflows/update_backend_version.py
+++ b/.github/workflows/update_backend_version.py
@@ -20,7 +20,7 @@
 major, minor, patch, *dev = pyproject_data["project"]["version"].split(".")
 pyproject_data["project"]["version"] = f"{major}.{minor}.{int(patch)+1}"
 
-juliapkg_data["packages"]["SymbolicRegression"]["rev"] = f"v{new_backend_version}"
+juliapkg_data["packages"]["SymbolicRegression"]["version"] = f"={new_backend_version}"
 
 with open(pyproject_toml, "w") as toml_file:
     toml_file.write(tomlkit.dumps(pyproject_data))
diff --git a/pyproject.toml b/pyproject.toml
index 9577862a1..1ba9d4927 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pysr"
-version = "0.18.0"
+version = "0.18.1"
 authors = [
     {name = "Miles Cranmer", email = "miles.cranmer@gmail.com"},
 ]
diff --git a/pysr/juliapkg.json b/pysr/juliapkg.json
index 60ded2547..ee8d2c021 100644
--- a/pysr/juliapkg.json
+++ b/pysr/juliapkg.json
@@ -3,8 +3,7 @@
     "packages": {
         "SymbolicRegression": {
             "uuid": "8254be44-1295-4e6a-a16d-46603ac705cb",
-            "url": "https://github.com/MilesCranmer/SymbolicRegression.jl",
-            "rev": "v0.24.1"
+            "version": "=0.24.1"
         },
         "Serialization": {
             "uuid": "9e88b42a-f829-5b0c-bbe9-9e923198166b",
diff --git a/pysr/test/test_dev_pysr.dockerfile b/pysr/test/test_dev_pysr.dockerfile
index 3470a7fa6..2978e82b7 100644
--- a/pysr/test/test_dev_pysr.dockerfile
+++ b/pysr/test/test_dev_pysr.dockerfile
@@ -35,10 +35,10 @@ RUN mkdir /pysr/pysr/test
 
 # Now, we create a custom version of SymbolicRegression.jl
 # First, we get the version from juliapkg.json:
-RUN python3 -c 'import json; print(json.load(open("/pysr/pysr/juliapkg.json", "r"))["packages"]["SymbolicRegression"]["rev"])' > /pysr/sr_version
+RUN python3 -c 'import json; print(json.load(open("/pysr/pysr/juliapkg.json", "r"))["packages"]["SymbolicRegression"]["version"])' > /pysr/sr_version
 
-# Remove v from the version:
-RUN cat /pysr/sr_version | sed 's/^v//g' > /pysr/sr_version_processed
+# Remove any = or ^ or ~ from the version:
+RUN cat /pysr/sr_version | sed 's/[\^=~]//g' > /pysr/sr_version_processed
 
 # Now, we check out the version of SymbolicRegression.jl that PySR is using:
 RUN git clone -b "v$(cat /pysr/sr_version_processed)" --single-branch https://github.com/MilesCranmer/SymbolicRegression.jl /srjl