From bded2296a00d725f983f57f88a72e94366d9034f Mon Sep 17 00:00:00 2001 From: Christopher Doris Date: Mon, 6 Nov 2023 18:25:01 +0000 Subject: [PATCH 1/2] initial commit of migration to package extensions --- docs/src/releasenotes.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/src/releasenotes.md b/docs/src/releasenotes.md index 38710c76..37e7b9e6 100644 --- a/docs/src/releasenotes.md +++ b/docs/src/releasenotes.md @@ -1,6 +1,9 @@ # Release Notes ## Unreleased (v1) +* The following functionality has been moved into package extensions, and therefore is now + only available on Julia 1.9+: + * TODO ## Unreleased * `Py` is now treated as a scalar when broadcasting. From 1a7c877c7932e557746db5f4e72448468848f6d7 Mon Sep 17 00:00:00 2001 From: Christopher Doris Date: Mon, 6 Nov 2023 18:33:22 +0000 Subject: [PATCH 2/2] remove dependency on Pkg --- Project.toml | 1 - docs/src/releasenotes.md | 1 + src/CPython/_.jl | 6 ------ src/Py/_.jl | 1 - src/jlwrap/_.jl | 2 -- 5 files changed, 1 insertion(+), 10 deletions(-) diff --git a/Project.toml b/Project.toml index b4de1e27..f68883e5 100644 --- a/Project.toml +++ b/Project.toml @@ -9,7 +9,6 @@ Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" 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" diff --git a/docs/src/releasenotes.md b/docs/src/releasenotes.md index 37e7b9e6..c54afa0e 100644 --- a/docs/src/releasenotes.md +++ b/docs/src/releasenotes.md @@ -1,6 +1,7 @@ # Release Notes ## Unreleased (v1) +* `juliacall.Pkg` is removed. * The following functionality has been moved into package extensions, and therefore is now only available on Julia 1.9+: * TODO diff --git a/src/CPython/_.jl b/src/CPython/_.jl index c2be2d13..ec660997 100644 --- a/src/CPython/_.jl +++ b/src/CPython/_.jl @@ -8,15 +8,9 @@ module _CPython using Base: @kwdef using UnsafePointers: UnsafePtr using CondaPkg: CondaPkg -using Pkg: Pkg using Requires: @require using Libdl: dlpath, dlopen, dlopen_e, dlclose, dlsym, dlsym_e, RTLD_LAZY, RTLD_DEEPBIND, RTLD_GLOBAL -# import Base: @kwdef -# import CondaPkg -# import Pkg -# using Libdl, Requires, UnsafePointers, Serialization, ..Utils - include("consts.jl") include("pointers.jl") include("extras.jl") diff --git a/src/Py/_.jl b/src/Py/_.jl index 065c87c7..aadd45ce 100644 --- a/src/Py/_.jl +++ b/src/Py/_.jl @@ -15,7 +15,6 @@ using Base: @propagate_inbounds, @kwdef using Dates: Date, Time, DateTime, year, month, day, hour, minute, second, millisecond, microsecond, nanosecond using MacroTools: @capture using Markdown: Markdown -# using MacroTools, Dates, Tables, Markdown, Serialization, Requires, Pkg, REPL include("gc.jl") include("Py.jl") diff --git a/src/jlwrap/_.jl b/src/jlwrap/_.jl index 4ad22787..34d9c7e9 100644 --- a/src/jlwrap/_.jl +++ b/src/jlwrap/_.jl @@ -10,7 +10,6 @@ using .._Py using .._Py: C, Utils, pynew, @autopy, incref, decref, setptr!, getptr, pyjuliacallmodule, pycopy!, errcheck, errset, PyNULL, pyistuple, pyisnull, pyJuliaError, pydel!, pyistype, pytypecheck, pythrow, pytuple_getitem, pyisslice, pystr_asstring, pyosmodule, pyisstr using .._pyconvert: pyconvert, @pyconvert, PYCONVERT_PRIORITY_WRAP, pyconvert_add_rule, pyconvert_tryconvert, pyconvertarg, pyconvert_result -using Pkg: Pkg using Base: @propagate_inbounds, allocatedinline import .._Py: Py @@ -51,7 +50,6 @@ function __init__() jl.Core = Core jl.Base = Base jl.Main = Main - jl.Pkg = Pkg jl.PythonCall = PythonCall end end