diff --git a/README.md b/README.md index c60d8f42..e69d6fd3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -

PythonCall.jl logo
PythonCall & JuliaCall

+

PythonCall.jl logo
PythonCall & JuliaCall

[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![Stable Documentation](https://img.shields.io/badge/docs-stable-blue.svg)](https://juliapy.github.io/PythonCall.jl/stable) diff --git a/docs/make.jl b/docs/make.jl index 7b47eb88..9b6c07a3 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -5,6 +5,9 @@ include("customdocs.jl") makedocs( sitename = "PythonCall & JuliaCall", modules = [PythonCall], + format = Documenter.HTML( + assets = ["assets/favicon.ico"], + ), warnonly = [:missing_docs], # avoid raising error when docs are missing pages = [ "Home" => "index.md", diff --git a/docs/src/assets/favicon.ico b/docs/src/assets/favicon.ico new file mode 100644 index 00000000..360742cb Binary files /dev/null and b/docs/src/assets/favicon.ico differ diff --git a/docs/src/assets/logo.png b/docs/src/assets/logo.png index 97bfc744..28456cd2 100644 Binary files a/docs/src/assets/logo.png and b/docs/src/assets/logo.png differ diff --git a/docs/src/juliacall.md b/docs/src/juliacall.md index dedaacde..98d74784 100644 --- a/docs/src/juliacall.md +++ b/docs/src/juliacall.md @@ -9,7 +9,7 @@ pip install juliacall Developers may wish to clone the repo (https://github.com/JuliaPy/PythonCall.jl) directly and pip install the module in editable mode. You should add `"dev":true, "path":"../.."` to -`python/juliacall/juliapkg.json` to ensure you use the development version of PythonCall +`pysrc/juliacall/juliapkg.json` to ensure you use the development version of PythonCall in conjunction with JuliaCall. ## Getting started diff --git a/pytest/test_all.py b/pytest/test_all.py index af7111e6..d34cd1b9 100644 --- a/pytest/test_all.py +++ b/pytest/test_all.py @@ -17,3 +17,22 @@ def test_issue_394(): assert jl.f is f assert jl.y is y assert jl.seval("f(x)") == 4 + +def test_issue_433(): + "https://github.com/JuliaPy/PythonCall.jl/issues/433" + from juliacall import Main as jl + + # Smoke test + jl.seval("x=1\nx=1") + assert jl.x == 1 + + # Do multiple things + out = jl.seval( + """ + function _issue_433_g(x) + return x^2 + end + _issue_433_g(5) + """ + ) + assert out == 25 diff --git a/src/JlWrap/module.jl b/src/JlWrap/module.jl index e88a6a4e..8d879ae5 100644 --- a/src/JlWrap/module.jl +++ b/src/JlWrap/module.jl @@ -10,7 +10,7 @@ function pyjlmodule_dir(self::Module) end function pyjlmodule_seval(self::Module, expr::Py) - Py(Base.eval(self, Meta.parse(strip(pyconvert(String, expr))))) + Py(Base.eval(self, Meta.parseall(strip(pyconvert(String, expr))))) end function init_module()