Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump juliacall from 0.9.15 to 0.9.19 #569

Merged
merged 7 commits into from
Mar 20, 2024
Merged

Bump juliacall from 0.9.15 to 0.9.19 #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6382a02
Bump juliacall from 0.9.15 to 0.9.16
dependabot[bot] Mar 14, 2024
f8fd6d2
Remove `seval` overwrite
MilesCranmer Mar 15, 2024
77011a3
Bump to juliacall 0.9.17
MilesCranmer Mar 17, 2024
59bff6e
Better range of Julia versions
MilesCranmer Mar 17, 2024
3d34b61
Fix Julia versions
MilesCranmer Mar 17, 2024
2827983
Bump juliacall version to 0.9.18
MilesCranmer Mar 18, 2024
3ec70e2
Bump juliacall version to 0.9.18
MilesCranmer Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions pysr/julia_import.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pysr/juliapkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"julia": "~1.6, ~1.7, ~1.8, ~1.9, =1.10.0, ^1.10.3",
"julia": "~1.6.7, ~1.7, ~1.8, ~1.9, ~1.10",
"packages": {
"SymbolicRegression": {
"uuid": "8254be44-1295-4e6a-a16d-46603ac705cb",
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.19
click>=7.0.0,<9.0.0
setuptools>=50.0.0
typing_extensions>=4.0.0,<5.0.0; python_version < "3.8"
Loading