Merge branch 'main' into v1

Author: Christopher Doris

.github/workflows/tests.yml

@@ -63,6 +63,10 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.pyversion }}
+      - name: Set up Julia 1.10.0
+        uses: julia-actions/setup-julia@v1
+        with:
+          version: '1.10.0'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

Project.toml

@@ -1,7 +1,7 @@
 name = "PythonCall"
 uuid = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d"
 authors = ["Christopher Doris <github.com/cjdoris>"]
-version = "0.9.15"
+version = "0.9.17"
 
 [deps]
 CondaPkg = "992eb4ea-22a4-4c89-a5bb-47a3300528ab"

bump.jl

@@ -27,4 +27,5 @@ bumpver("pysrc/juliacall/__init__.py", "__version__ = '{}'\n", oldver, newver)
 bumpver("pysrc/juliacall/juliapkg.json", "\"version\": \"={}\"", oldver, newver)
 bumpver("pysrc/juliacall/juliapkg-dev.json", "\"version\": \"={}\"", oldver, newver)
 bumpver("src/PythonCall.jl", "VERSION = v\"{}\"", oldver, newver)
+bumpver("src/Core/Core.jl", "VERSION = v\"{}\"", oldver, newver)
 bump("docs/src/releasenotes.md", "## Unreleased", "## $newver ($(today()))")

docs/src/releasenotes.md

@@ -3,10 +3,15 @@
 ## Unreleased (v1)
 * `PythonCall.GC` is now more like `Base.GC`: `enable(true)` replaces `enable()`, `enable(false)` replaces `disable()`, and `gc()` is added.
 
-## Unreleased
+## 0.9.17 (2024-03-16)
+* Bug fixes.
+
+## 0.9.16 (2024-03-14)
+* Big internal refactor.
 * New unexported functions: `python_executable_path`, `python_library_path`, `python_library_handle` and `python_version`.
 * `Py` is now treated as a scalar when broadcasting.
 * `PyArray` is now serializable.
+* Removed compatibility with Julia 1.10.1 and 1.10.2 (to be fixed in 1.10.3 and 1.11.0) due to an upstream bug.
 * Bug fixes.
 
 ## 0.9.15 (2023-10-25)

pysrc/juliacall/__init__.py

@@ -1,7 +1,7 @@
 # This module gets modified by PythonCall when it is loaded, e.g. to include Core, Base
 # and Main modules.
 
-__version__ = '0.9.15'
+__version__ = '0.9.17'
 
 _newmodule = None
 
@@ -18,7 +18,7 @@ def convert(T, x):
     "Convert x to a Julia T."
     global _convert
     if _convert is None:
-        _convert = PythonCall.seval("pyjlcallback((T,x)->pyjl(pyconvert(pyjlvalue(T)::Type,x)))")
+        _convert = PythonCall.JlWrap.seval("pyjlcallback((T,x)->pyjl(pyconvert(pyjlvalue(T)::Type,x)))")
     return _convert(T, x)
 
 def interactive(enable=True):

pysrc/juliacall/juliapkg-dev.json

@@ -1,9 +1,9 @@
 {
-    "julia": "1.6.1",
+    "julia": "~1.6.1, ~1.7, ~1.8, ~1.9, =1.10.0",
     "packages": {
         "PythonCall": {
             "uuid": "6099a3de-0909-46bc-b1f4-468b9a2dfc0d",
-            "version": "=0.9.15",
+            "version": "=0.9.17",
             "path": "../..",
             "dev": true
         }

pysrc/juliacall/juliapkg.json

@@ -1,9 +1,9 @@
 {
-    "julia": "1.6.1",
+    "julia": "~1.6.1, ~1.7, ~1.8, ~1.9, =1.10.0",
     "packages": {
         "PythonCall": {
             "uuid": "6099a3de-0909-46bc-b1f4-468b9a2dfc0d",
-            "version": "=0.9.15"
+            "version": "=0.9.17"
         }
     }
 }

pytest/test_all.py

@@ -1,6 +1,45 @@
 def test_import():
     import juliacall
 
+def test_newmodule():
+    import juliacall
+    jl = juliacall.Main
+    m = juliacall.newmodule("TestModule")
+    assert isinstance(m, juliacall.ModuleValue)
+    assert jl.isa(m, jl.Module)
+    assert str(jl.nameof(m)) == "TestModule"
+
+def test_convert():
+    import juliacall
+    jl = juliacall.Main
+    for (x, t) in [(None, jl.Nothing), (True, jl.Bool), ([1,2,3], jl.Vector)]:
+        y = juliacall.convert(t, x)
+        assert isinstance(y, juliacall.AnyValue)
+        assert jl.isa(y, t)
+
+def test_interactive():
+    import juliacall
+    juliacall.interactive(True)
+    juliacall.interactive(False)
+
+def test_JuliaError():
+    import juliacall
+    jl = juliacall.Main
+    assert isinstance(juliacall.JuliaError, type)
+    assert issubclass(juliacall.JuliaError, Exception)
+    try:
+        juliacall.Base.error("test error")
+        err = None
+    except juliacall.JuliaError as e:
+        err = e
+    assert err is not None
+    assert isinstance(err, juliacall.JuliaError)
+    exc = err.exception
+    assert jl.isa(exc, jl.ErrorException)
+    assert str(exc.msg) == "test error"
+    bt = err.backtrace
+    assert bt is not None
+
 def test_issue_394():
     "https://github.com/JuliaPy/PythonCall.jl/issues/394"
     from juliacall import Main as jl

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = juliacall
-version = 0.9.15
+version = 0.9.17
 description = Julia and Python in seamless harmony
 long_description = file: README.md
 long_description_content_type = text/markdown

src/C/context.jl

@@ -122,7 +122,7 @@ function init_context()
                     break
                 end
             end
-            CTX.lib_path === nothing && error("""
+            CTX.lib_path === missing && error("""
                 Could not find Python library for Python executable $(repr(CTX.exe_path)).
 
                 If you know where the library is, set environment variable 'JULIA_PYTHONCALL_LIB' to its path.

src/Core/Core.jl

@@ -5,7 +5,7 @@ Defines the `Py` type and directly related functions.
 """
 module Core
 
-const VERSION = v"0.9.15"
+const VERSION = v"0.9.17"
 const ROOT_DIR = dirname(dirname(@__DIR__))
 
 using ..PythonCall: PythonCall  # needed for docstring cross-refs

src/Core/stdlib.jl

@@ -18,18 +18,7 @@ function init_stdlib()
         # if Python is interactive, ensure Julia is too
         if pyhasattr(pysysmodule, "ps1")
             Base.eval(:(is_interactive = true))
-            REPL = Base.require(Base.PkgId(Base.UUID("3fa0cd96-eef1-5676-8a61-b3b8758bbffb"), "REPL"))
-            # adapted from run_main_repl() in julia/base/client.jl
             Base.load_InteractiveUtils()
-            term_env = get(ENV, "TERM", Sys.iswindows() ? "" : "dumb")
-            term = REPL.Terminals.TTYTerminal(term_env, stdin, stdout, stderr)
-            if term.term_type == "dumb"
-                repl = REPL.BasicREPL(term)
-            else
-                repl = REPL.LineEditREPL(term, get(stdout, :color, false), true)
-                repl.history_file = false
-            end
-            pushdisplay(REPL.REPLDisplay(repl))
         end
 
     else

src/PythonCall.jl

@@ -1,6 +1,6 @@
 module PythonCall
 
-const VERSION = v"0.9.15"
+const VERSION = v"0.9.17"
 const ROOT_DIR = dirname(@__DIR__)
 
 include("Utils/Utils.jl")