diff --git a/pysr/test/generate_dev_juliapkg.py b/pysr/test/generate_dev_juliapkg.py index 05f7066b..ac4f6b29 100644 --- a/pysr/test/generate_dev_juliapkg.py +++ b/pysr/test/generate_dev_juliapkg.py @@ -9,10 +9,11 @@ with open(juliapkg_json, "r") as f: juliapkg = json.load(f) -del juliapkg["packages"]["SymbolicRegression"]["rev"] -del juliapkg["packages"]["SymbolicRegression"]["url"] -juliapkg["packages"]["SymbolicRegression"]["path"] = path_to_srjl -juliapkg["packages"]["SymbolicRegression"]["dev"] = True +juliapkg["packages"]["SymbolicRegression"] = { + "uuid": juliapkg["packages"]["SymbolicRegression"]["uuid"], + "path": path_to_srjl, + "dev": True, +} with open(juliapkg_json, "w") as f: json.dump(juliapkg, f, indent=4) diff --git a/pysr/test/test_dev_pysr.dockerfile b/pysr/test/test_dev_pysr.dockerfile index a85e1a5c..3470a7fa 100644 --- a/pysr/test/test_dev_pysr.dockerfile +++ b/pysr/test/test_dev_pysr.dockerfile @@ -33,8 +33,6 @@ ADD ./pysr/_cli/*.py /pysr/pysr/_cli/ RUN mkdir /pysr/pysr/test -RUN pip3 install --no-cache-dir . - # 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 @@ -53,5 +51,5 @@ RUN sed -i 's/module SymbolicRegression/module SymbolicRegression\n__test_functi ADD ./pysr/test/generate_dev_juliapkg.py /generate_dev_juliapkg.py RUN python3 /generate_dev_juliapkg.py /pysr/pysr/juliapkg.json /srjl -# Precompile -RUN python3 -c 'import pysr' +# Install and pre-compile +RUN pip3 install --no-cache-dir . && python3 -c 'import pysr'