From 8d921101c4d3de38ae0cb478ceb0d49c2a326612 Mon Sep 17 00:00:00 2001 From: MilesCranmer Date: Sun, 2 Jul 2023 17:09:34 -0400 Subject: [PATCH 1/5] Include Python and Julia version in PySR env --- pysr/julia_helpers.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pysr/julia_helpers.py b/pysr/julia_helpers.py index 5a61a1af9..204c95bfb 100644 --- a/pysr/julia_helpers.py +++ b/pysr/julia_helpers.py @@ -118,7 +118,16 @@ def _import_error(): def _process_julia_project(julia_project): if julia_project is None: is_shared = True - processed_julia_project = f"pysr-{__version__}" + juliainfo = _load_juliainfo() + julia_version = ".".join( + map(str, (juliainfo.version_major, juliainfo.version_minor)) + ) + python_version = ".".join(map(str, sys.version_info[:2])) + processed_julia_project = ( + f"pysr-{__version__}" + f"-py-{python_version}" + f"-jl-{julia_version}" + ) elif julia_project[0] == "@": is_shared = True processed_julia_project = julia_project[1:] From 8f2ac015ec74cacd78751b736fc34f7609e9978b Mon Sep 17 00:00:00 2001 From: "deepsource-autofix[bot]" <62050782+deepsource-autofix[bot]@users.noreply.github.com> Date: Sun, 2 Jul 2023 21:20:18 +0000 Subject: [PATCH 2/5] style: Format code with black --- pysr/julia_helpers.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pysr/julia_helpers.py b/pysr/julia_helpers.py index 204c95bfb..7abe0e95e 100644 --- a/pysr/julia_helpers.py +++ b/pysr/julia_helpers.py @@ -124,9 +124,7 @@ def _process_julia_project(julia_project): ) python_version = ".".join(map(str, sys.version_info[:2])) processed_julia_project = ( - f"pysr-{__version__}" - f"-py-{python_version}" - f"-jl-{julia_version}" + f"pysr-{__version__}" f"-py-{python_version}" f"-jl-{julia_version}" ) elif julia_project[0] == "@": is_shared = True From 993ae5a6d7bb691b3da2e693fc7f1c1f0f824972 Mon Sep 17 00:00:00 2001 From: Miles Cranmer Date: Sun, 2 Jul 2023 17:21:29 -0400 Subject: [PATCH 3/5] Combine string of versions --- pysr/julia_helpers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pysr/julia_helpers.py b/pysr/julia_helpers.py index 7abe0e95e..05cfe1ebc 100644 --- a/pysr/julia_helpers.py +++ b/pysr/julia_helpers.py @@ -124,7 +124,7 @@ def _process_julia_project(julia_project): ) python_version = ".".join(map(str, sys.version_info[:2])) processed_julia_project = ( - f"pysr-{__version__}" f"-py-{python_version}" f"-jl-{julia_version}" + f"pysr-{__version__}-py-{python_version}-jl-{julia_version}" ) elif julia_project[0] == "@": is_shared = True From bd6be37da651561ba0a7a5ce253da41d2aabfa2e Mon Sep 17 00:00:00 2001 From: Miles Cranmer Date: Sun, 2 Jul 2023 20:00:36 -0400 Subject: [PATCH 4/5] Remove Python version from env name --- pysr/julia_helpers.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pysr/julia_helpers.py b/pysr/julia_helpers.py index 05cfe1ebc..3f233923f 100644 --- a/pysr/julia_helpers.py +++ b/pysr/julia_helpers.py @@ -122,9 +122,8 @@ def _process_julia_project(julia_project): julia_version = ".".join( map(str, (juliainfo.version_major, juliainfo.version_minor)) ) - python_version = ".".join(map(str, sys.version_info[:2])) processed_julia_project = ( - f"pysr-{__version__}-py-{python_version}-jl-{julia_version}" + f"pysr-{__version__}-jl-{julia_version}" ) elif julia_project[0] == "@": is_shared = True From 5d377fa2988f754222e5b6df87b374d17cf49ba8 Mon Sep 17 00:00:00 2001 From: "deepsource-autofix[bot]" <62050782+deepsource-autofix[bot]@users.noreply.github.com> Date: Mon, 3 Jul 2023 00:00:48 +0000 Subject: [PATCH 5/5] style: Format code with black --- pysr/julia_helpers.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pysr/julia_helpers.py b/pysr/julia_helpers.py index 3f233923f..43abe8bb8 100644 --- a/pysr/julia_helpers.py +++ b/pysr/julia_helpers.py @@ -122,9 +122,7 @@ def _process_julia_project(julia_project): julia_version = ".".join( map(str, (juliainfo.version_major, juliainfo.version_minor)) ) - processed_julia_project = ( - f"pysr-{__version__}-jl-{julia_version}" - ) + processed_julia_project = f"pysr-{__version__}-jl-{julia_version}" elif julia_project[0] == "@": is_shared = True processed_julia_project = julia_project[1:]