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

fix: patch changed behavior of setproperty! for modules #583

Merged
merged 15 commits into from
Jan 20, 2025
Merged

fix: patch changed behavior of setproperty! for modules #583

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ddf15ed
fix: patch changed behavior of `setproperty!` for modules
MilesCranmer Jan 1, 2025
8c53abe
test: fix Aqua stale deps test
MilesCranmer Jan 1, 2025
a5aca51
test: ignore broken tests temporarily
MilesCranmer Jan 2, 2025
4268eca
test: ignore GC test for 1.11
MilesCranmer Jan 2, 2025
1de6077
test: ignore julia GC test on pre-1.10
MilesCranmer Jan 2, 2025
0b8029f
remove unused REPL dependency
Jan 20, 2025
2fc6479
investigating why this test fails on julia 1.11
Jan 20, 2025
e1f56be
removing version-dependent behaviour
Jan 20, 2025
12a503e
Merge remote-tracking branch 'origin/main' into pr/MilesCranmer/583
Jan 20, 2025
40f9b83
revert skipped tests
Jan 20, 2025
dbdb3d8
fix jlwrap test
Jan 20, 2025
28c7d88
fix merge error
Jan 20, 2025
6f0221a
fix unbound args error
Jan 20, 2025
39cc178
re-skip test to fix later
Jan 20, 2025
5b18d6b
reintroduce skipped test
Jan 20, 2025
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
4 changes: 4 additions & 0 deletions src/JlWrap/any.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 VERSION >= v"1.11.0-" && 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
Expand Down
6 changes: 5 additions & 1 deletion test/Aqua.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,9 @@
# The unbound_args test fails on methods with signature like foo(::Type{Tuple{Vararg{V}}}) where V
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated but this is a real unbound_args. V is unbound in Tuple{Vararg{V}} because () is technically a subtype - in which case V has no definition.

Correct signature with bounded V would be Tuple{V,Vararg{V}}

# Seems like a bug.
import Aqua
Aqua.test_all(PythonCall, unbound_args = false)
Aqua.test_all(
PythonCall,
unbound_args = false,
stale_deps = (; ignore = [:REPL])
)
end
Loading