From 6382a024e116e025ff08d9add06987857ae38cca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 20:02:13 +0000 Subject: [PATCH 1/7] Bump juliacall from 0.9.15 to 0.9.16 Bumps [juliacall](https://github.com/JuliaPy/PythonCall.jl) from 0.9.15 to 0.9.16. - [Release notes](https://github.com/JuliaPy/PythonCall.jl/releases) - [Commits](https://github.com/JuliaPy/PythonCall.jl/compare/v0.9.15...v0.9.16) --- updated-dependencies: - dependency-name: juliacall dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 86e93ecde..0db56aef0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ sympy>=1.0.0,<2.0.0 pandas>=0.21.0,<3.0.0 numpy>=1.13.0,<2.0.0 scikit_learn>=1.0.0,<2.0.0 -juliacall==0.9.15 +juliacall==0.9.16 click>=7.0.0,<9.0.0 setuptools>=50.0.0 typing_extensions>=4.0.0,<5.0.0; python_version < "3.8" From f8fd6d282129628288eee340d2bcba257834f2a0 Mon Sep 17 00:00:00 2001 From: Miles Cranmer Date: Fri, 15 Mar 2024 23:25:15 +0000 Subject: [PATCH 2/7] Remove `seval` overwrite --- pysr/julia_import.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pysr/julia_import.py b/pysr/julia_import.py index 3e588d3b7..a88a28535 100644 --- a/pysr/julia_import.py +++ b/pysr/julia_import.py @@ -37,17 +37,6 @@ from juliacall import Main as jl # type: ignore -# Overwrite the seval function to use Meta.parseall -# instead of Meta.parse. -jl.seval("using PythonCall: PythonCall, Py, pyconvert") -jl.seval( - """function PythonCall.pyjlmodule_seval(self::Module, expr::Py) - e = Meta.parseall(strip(pyconvert(String, expr))) - Py(Base.eval(self, e)) -end""" -) -# ^TODO: Overwrite this once PythonCall.jl is updated: - jl_version = (jl.VERSION.major, jl.VERSION.minor, jl.VERSION.patch) # Next, automatically load the juliacall extension if we're in a Jupyter notebook From 77011a35f66f255e888379f041eae874a6b5818b Mon Sep 17 00:00:00 2001 From: Miles Cranmer Date: Sun, 17 Mar 2024 16:01:11 +0000 Subject: [PATCH 3/7] Bump to juliacall 0.9.17 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0db56aef0..c580c56f3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ sympy>=1.0.0,<2.0.0 pandas>=0.21.0,<3.0.0 numpy>=1.13.0,<2.0.0 scikit_learn>=1.0.0,<2.0.0 -juliacall==0.9.16 +juliacall==0.9.17 click>=7.0.0,<9.0.0 setuptools>=50.0.0 typing_extensions>=4.0.0,<5.0.0; python_version < "3.8" From 59bff6e2ce08379e45ccbe0e0174cc530340a545 Mon Sep 17 00:00:00 2001 From: Miles Cranmer Date: Sun, 17 Mar 2024 16:29:23 +0000 Subject: [PATCH 4/7] Better range of Julia versions --- pysr/juliapkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pysr/juliapkg.json b/pysr/juliapkg.json index 5d5063245..3cea27784 100644 --- a/pysr/juliapkg.json +++ b/pysr/juliapkg.json @@ -1,5 +1,5 @@ { - "julia": "~1.6, ~1.7, ~1.8, ~1.9, =1.10.0, ^1.10.3", + "julia": "1.6.7 - 1.10", "packages": { "SymbolicRegression": { "uuid": "8254be44-1295-4e6a-a16d-46603ac705cb", From 3d34b61b57f56c323d541ba3d6e28dfc0abe7014 Mon Sep 17 00:00:00 2001 From: Miles Cranmer Date: Sun, 17 Mar 2024 17:07:12 +0000 Subject: [PATCH 5/7] Fix Julia versions --- pysr/juliapkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pysr/juliapkg.json b/pysr/juliapkg.json index 3cea27784..58c59fce1 100644 --- a/pysr/juliapkg.json +++ b/pysr/juliapkg.json @@ -1,5 +1,5 @@ { - "julia": "1.6.7 - 1.10", + "julia": "~1.6.7, ~1.7, ~1.8, ~1.9, ~1.10", "packages": { "SymbolicRegression": { "uuid": "8254be44-1295-4e6a-a16d-46603ac705cb", From 2827983429a7dee74059a150627617348beceb3b Mon Sep 17 00:00:00 2001 From: Miles Cranmer Date: Mon, 18 Mar 2024 22:22:50 +0000 Subject: [PATCH 6/7] Bump juliacall version to 0.9.18 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c580c56f3..baffc2e5e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ sympy>=1.0.0,<2.0.0 pandas>=0.21.0,<3.0.0 numpy>=1.13.0,<2.0.0 scikit_learn>=1.0.0,<2.0.0 -juliacall==0.9.17 +juliacall==0.9.18 click>=7.0.0,<9.0.0 setuptools>=50.0.0 typing_extensions>=4.0.0,<5.0.0; python_version < "3.8" From 3ec70e2ab9f07da2b5fe8b993b9a9254815cb4fe Mon Sep 17 00:00:00 2001 From: Miles Cranmer Date: Wed, 20 Mar 2024 19:26:05 +0000 Subject: [PATCH 7/7] Bump juliacall version to 0.9.18 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index baffc2e5e..27e6ce514 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ sympy>=1.0.0,<2.0.0 pandas>=0.21.0,<3.0.0 numpy>=1.13.0,<2.0.0 scikit_learn>=1.0.0,<2.0.0 -juliacall==0.9.18 +juliacall==0.9.19 click>=7.0.0,<9.0.0 setuptools>=50.0.0 typing_extensions>=4.0.0,<5.0.0; python_version < "3.8"