switch to Extensions

.gitignore

@@ -1,6 +1,5 @@
 *.jl.*.cov
 *.jl.cov
 *.jl.mem
-/Manifest.toml
-/docs/Manifest.toml
+Manifest.toml
 /docs/build/

Project.toml

@@ -13,6 +13,14 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 
+[weakdeps]
+ImageCore = "a09fc81d-aa75-5fe9-8630-4744c3626534"
+StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
+
+[extensions]
+ImageCoreExt = "ImageCore"
+StructArraysExt = "StructArrays"
+
 [compat]
 ColorTypes = "0.11.2"
 ColorVectorSpace = "0.9"
@@ -22,11 +30,3 @@ FixedPointNumbers = "0.8"
 Reexport = "1"
 Requires = "1"
 julia = "1.6"
-
-[extras]
-ImageCore = "a09fc81d-aa75-5fe9-8630-4744c3626534"
-StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
-
-[targets]
-test = ["ImageCore", "StructArrays", "Test"]

src/imagecore.jl → ext/ImageCoreExt.jl

@@ -1,3 +1,20 @@
+module ImageCoreExt
+
+@static if isdefined(Base, :get_extension)
+    using ImageCore
+else
+    using ..ImageCore
+end
+
+using MultiChannelColors: ColorMixture
+
 # clamp01 is designed to work on RGB colors (a major usage is for display), so convert first
 ImageCore.clamp01(c::ColorMixture{T}) where T = convert(RGB{T}, ImageCore.clamp01(convert(RGB{floattype(T)}, c)))
 ImageCore.clamp01nan(c::ColorMixture{T}) where T = convert(RGB{T}, ImageCore.clamp01nan(convert(RGB{floattype(T)}, c)))
+
+function __init__()
+    @debug "ImageCoreExt loaded"
+    return nothing
+end
+
+end

src/structarrays.jl → ext/StructArraysExt.jl

@@ -1,3 +1,12 @@
+module StructArraysExt
+
+@static if isdefined(Base, :get_extension)
+    using StructArrays
+else
+    using ..StructArrays
+end
+using MultiChannelColors: ColorMixture
+
 channelname(N::Int, i::Int) = Symbol("channel" * lpad(string(i), ndigits(N), '0'))
 
 function StructArrays.staticschema(::Type{ColorMixture{T,N,Cs}}) where {T, N, Cs}
@@ -29,3 +38,10 @@ end
 function StructArrays.createinstance(::Type{ColorMixture{T,N,Cs}}, args...) where {T, N, Cs}
     return ColorMixture{T,N,Cs}(args)
 end
+
+function __init__()
+    @debug "StructArraysExt loaded"
+    return nothing
+end
+
+end

src/MultiChannelColors.jl

@@ -7,7 +7,6 @@ using Reexport
 @reexport using ColorTypes
 using Colors
 using ColorVectorSpace
-using Requires
 
 using ColorVectorSpace: _mapc, _mul, _div, rettype, acctype
 
@@ -24,9 +23,15 @@ include("fluorophores.jl")
 include("utils.jl")
 include("operations.jl")
 
+@static if !isdefined(Base, :get_extension)
+    using Requires
+end
+
 function __init__()
-    @require StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a" include("structarrays.jl")
-    @require ImageCore = "a09fc81d-aa75-5fe9-8630-4744c3626534" include("imagecore.jl")
+    @static if !isdefined(Base, :get_extension)
+        @require StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a" include("../ext/StructArraysExt.jl")
+        @require ImageCore = "a09fc81d-aa75-5fe9-8630-4744c3626534" include("../ext/ImageCoreExt.jl")
+    end
 end
 
 end

test/Project.toml

@@ -0,0 +1,5 @@
+[deps]
+ImageCore = "a09fc81d-aa75-5fe9-8630-4744c3626534"
+LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

test/runtests.jl

@@ -87,7 +87,11 @@ using ImageCore
         @test c2 == c0
 
         f_infer16(i1, i2) = ColorMixture{N0f16}((fluorophore_rgb"EGFP", fluorophore_rgb"tdTomato"), (i1, i2))
-        @test_broken @inferred f_infer16(1, 0)
+        if Base.VERSION >= v"1.10.0-9ded051e9f8"
+            @test_nowarn @inferred f_infer16(1, 0)
+        else
+            @test_broken @inferred f_infer16(1, 0)
+        end
 
         # Inferrability from a template
         ctmpl = ColorMixture(channels)