Merge remote-tracking branch 'origin/main' into pr/MilesCranmer/547

Christopher Doris · Christopher Doris · commit cadb7cab3f50 · 2025-02-21T22:44:15.000Z
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "PythonCall"
 uuid = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d"
 authors = ["Christopher Doris <github.com/cjdoris>"]
-version = "0.9.23"
+version = "0.9.24"
 
 [deps]
 CondaPkg = "992eb4ea-22a4-4c89-a5bb-47a3300528ab"
@@ -10,7 +10,6 @@ Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
-REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
@@ -24,7 +23,6 @@ Libdl = "1"
 MacroTools = "0.5"
 Markdown = "1"
 Pkg = "1"
-REPL = "1"
 Requires = "1"
 Serialization = "1"
 Tables = "1"
diff --git a/docs/src/releasenotes.md b/docs/src/releasenotes.md
@@ -1,8 +1,11 @@
 # Release Notes
 
-## 0.9.24
+## Unreleased
 * Added `PYTHON_JULIACALL_HEAP_SIZE_HINT` option to configure initial Julia heap size.
 
+## 0.9.24 (2025-01-22)
+* Bug fixes.
+
 ## 0.9.23 (2024-08-22)
 * Bug fixes.
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,26 +1,19 @@
 [build-system]
-requires = ["setuptools>=42", "wheel"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
 
 [project]
 name = "juliacall"
-version = "0.9.23"
+version = "0.9.24"
 description = "Julia and Python in seamless harmony"
 readme = { file = "README.md", content-type = "text/markdown" }
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",
-    "Operating System :: OS Independent"
+    "Operating System :: OS Independent",
 ]
 requires-python = ">=3.8"
 dependencies = ["juliapkg ~=0.1.8"]
 
-[tool.setuptools]
-zip-safe = false
-
-[tool.setuptools.packages.find]
-where = ["pysrc"]
-include = ["juliacall"]
-
-[tool.setuptools.package-data]
-"juliacall" = ["*.json", "*.jl"]
+[tool.hatch.build.targets.wheel]
+packages = ["pysrc/juliacall"]
diff --git a/pysrc/juliacall/__init__.py b/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.23'
+__version__ = '0.9.24'
 
 _newmodule = None
 
diff --git a/pysrc/juliacall/juliapkg-dev.json b/pysrc/juliacall/juliapkg-dev.json
@@ -3,7 +3,7 @@
     "packages": {
         "PythonCall": {
             "uuid": "6099a3de-0909-46bc-b1f4-468b9a2dfc0d",
-            "version": "=0.9.23",
+            "version": "=0.9.24",
             "path": "../..",
             "dev": true
         }
diff --git a/pysrc/juliacall/juliapkg.json b/pysrc/juliacall/juliapkg.json
@@ -3,7 +3,7 @@
     "packages": {
         "PythonCall": {
             "uuid": "6099a3de-0909-46bc-b1f4-468b9a2dfc0d",
-            "version": "=0.9.23"
+            "version": "=0.9.24"
         }
     }
 }
diff --git a/pytest/test_all.py b/pytest/test_all.py
@@ -94,6 +94,10 @@ def test_issue_433():
 def test_julia_gc():
     from juliacall import Main as jl
 
+    if jl.seval('v"1.11.0-" <= VERSION < v"1.11.3"'):
+        # Seems to be a Julia bug - hopefully fixed in 1.11.3
+        pytest.skip("Test not yet supported on Julia 1.11+")
+
     # We make a bunch of python objects with no reference to them,
     # then call GC to try to finalize them.
     # We want to make sure we don't segfault.
diff --git a/src/Convert/rules.jl b/src/Convert/rules.jl
@@ -346,7 +346,7 @@ for N = 0:16
     end
     # Tuple with N elements plus Vararg
     @eval function pyconvert_rule_iterable(
-        ::Type{Tuple{$(Ts...),Vararg{V}}},
+        ::Type{Tuple{$(Ts...),V,Vararg{V}}},
         xs::Py,
     ) where {$(Ts...),V}
         xs = pytuple(xs)
diff --git a/src/Core/Core.jl b/src/Core/Core.jl
@@ -5,7 +5,7 @@ Defines the `Py` type and directly related functions.
 """
 module Core
 
-const VERSION = v"0.9.23"
+const VERSION = v"0.9.24"
 const ROOT_DIR = dirname(dirname(@__DIR__))
 
 using ..PythonCall: PythonCall  # needed for docstring cross-refs
diff --git a/src/JlWrap/any.jl b/src/JlWrap/any.jl
@@ -26,6 +26,10 @@ function pyjlany_setattr(self, k_::Py, v_::Py)
     k = Symbol(pyjl_attr_py2jl(pyconvert(String, k_)))
     pydel!(k_)
     v = pyconvert(Any, v_)
+    if self isa Module && !isdefined(self, k)
+        # Fix for https://github.com/JuliaLang/julia/pull/54678
+        Base.Core.eval(self, Expr(:global, k))
+    end
     setproperty!(self, k, v)
     Py(nothing)
 end
diff --git a/src/PythonCall.jl b/src/PythonCall.jl
@@ -1,6 +1,6 @@
 module PythonCall
 
-const VERSION = v"0.9.23"
+const VERSION = v"0.9.24"
 const ROOT_DIR = dirname(@__DIR__)
 
 include("Utils/Utils.jl")
diff --git a/src/Wrap/PyList.jl b/src/Wrap/PyList.jl
@@ -61,6 +61,13 @@ function Base.append!(x::PyList, vs)
     return x
 end
 
+function Base.prepend!(x::PyList, vs)
+    for v in reverse(vs)
+        pushfirst!(x, v)
+    end
+    return x
+end
+
 function Base.push!(x::PyList, v1, v2, vs...)
     push!(x, v1)
     push!(x, v2, vs...)
diff --git a/test/Aqua.jl b/test/Aqua.jl
@@ -1,6 +1,4 @@
 @testitem "Aqua" begin
-    # The unbound_args test fails on methods with signature like foo(::Type{Tuple{Vararg{V}}}) where V
-    # Seems like a bug.
     import Aqua
-    Aqua.test_all(PythonCall, unbound_args = false)
+    Aqua.test_all(PythonCall)
 end
diff --git a/test/GC.jl b/test/GC.jl
@@ -5,7 +5,9 @@
             finalize(obj)
         end
     end
-    Threads.nthreads() > 1 && @test !isempty(PythonCall.GC.QUEUE.items)
+    Threads.nthreads() > 1 &&
+        VERSION >= v"1.10.0-" &&
+        @test !isempty(PythonCall.GC.QUEUE.items)
     PythonCall.GC.gc()
     @test isempty(PythonCall.GC.QUEUE.items)
 end
@@ -17,7 +19,9 @@ end
             finalize(obj)
         end
     end
-    Threads.nthreads() > 1 && @test !isempty(PythonCall.GC.QUEUE.items)
+    Threads.nthreads() > 1 &&
+        VERSION >= v"1.10.0-" &&
+        @test !isempty(PythonCall.GC.QUEUE.items)
     GC.gc()
     @test isempty(PythonCall.GC.QUEUE.items)
 end
diff --git a/test/JlWrap.jl b/test/JlWrap.jl
@@ -210,8 +210,8 @@
         pyjl(Foo(1))._jl_display(mime = "text/plain")
     end
     @testset "help" begin
-        pyjl(Foo(1))._jl_help()
-        pyjl(Foo(1))._jl_help(mime = "text/plain")
+        @test_skip pyis(pyjl(Foo(1))._jl_help(), nothing)
+        @test_skip pyis(pyjl(Foo(1))._jl_help(mime = "text/plain"), nothing)
     end
 end
 
diff --git a/test/Wrap.jl b/test/Wrap.jl
@@ -381,6 +381,13 @@ end
         @test_throws Exception append!(t, [nothing, missing])
         @test t == [1, 2, 3, 4, 5, 6]
     end
+    @testset "prepend!" begin
+        t = copy(z)
+        @test prepend!(t, [-3, -2, -1]) === t
+        @test t == [-3, -2, -1, 1, 2, 3]
+        @test_throws Exception append!(t, [nothing, missing])
+        @test t == [-3, -2, -1, 1, 2, 3]
+    end
     @testset "pop!" begin
         t = copy(z)
         @test pop!(t) == 3

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"packages": {`
`4`	`4`	`"PythonCall": {`
`5`	`5`	`"uuid": "6099a3de-0909-46bc-b1f4-468b9a2dfc0d",`
`6`		`- "version": "=0.9.23",`
	`6`	`+ "version": "=0.9.24",`
`7`	`7`	`"path": "../..",`
`8`	`8`	`"dev": true`
`9`	`9`	`}`