From 871124776df0c727e74e4374e3782b20e3ba83b5 Mon Sep 17 00:00:00 2001 From: CompatHelper Julia Date: Fri, 13 Sep 2024 15:21:45 +0000 Subject: [PATCH 1/3] CompatHelper: bump compat for SolidStateDetectors in [weakdeps] to 0.10, (keep existing compat) --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 7407a4e..8dc460f 100644 --- a/Project.toml +++ b/Project.toml @@ -63,7 +63,7 @@ PropertyDicts = "0.2" PropertyFunctions = "0.2.1" RecipesBase = "1" Requires = "0.5, 1" -SolidStateDetectors = "0.8, 0.9" +SolidStateDetectors = "0.8, 0.9, 0.10" StaticStrings = "0.2" Statistics = "1" StructArrays = "0.4, 0.5, 0.6" From 71b5e3ba554fd8bec31be6158039350e599a8f8f Mon Sep 17 00:00:00 2001 From: Oliver Schulz Date: Fri, 13 Sep 2024 21:00:00 +0200 Subject: [PATCH 2/3] Increase package version to 0.3.3 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 8dc460f..00c7957 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "LegendDataManagement" uuid = "9feedd95-f0e0-423f-a8dc-de0970eae6b3" -version = "0.3.2" +version = "0.3.3" [deps] Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" From 29401216a5852de109ebd082eaf4122eaaef55ca Mon Sep 17 00:00:00 2001 From: Felix Hagemann Date: Wed, 18 Sep 2024 15:34:55 +0200 Subject: [PATCH 3/3] Drop dependency on `Requires` --- Project.toml | 2 -- ext/LegendDataManagementLegendHDF5IOExt.jl | 10 ++-------- src/LegendDataManagement.jl | 11 ----------- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/Project.toml b/Project.toml index 00c7957..fcab729 100644 --- a/Project.toml +++ b/Project.toml @@ -21,7 +21,6 @@ PropDicts = "4dc08600-4268-439e-8673-d706fafbb426" PropertyDicts = "f8a19df8-e894-5f55-a973-672c1158cbca" PropertyFunctions = "09e99361-2bb8-48a2-a80f-de58f0739eb4" RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" -Requires = "ae029012-a4dd-5104-9daa-d747884805df" StaticStrings = "4db0a0c5-418a-4e1d-8806-cb305fe13294" Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a" @@ -62,7 +61,6 @@ PropDicts = "0.2.4" PropertyDicts = "0.2" PropertyFunctions = "0.2.1" RecipesBase = "1" -Requires = "0.5, 1" SolidStateDetectors = "0.8, 0.9, 0.10" StaticStrings = "0.2" Statistics = "1" diff --git a/ext/LegendDataManagementLegendHDF5IOExt.jl b/ext/LegendDataManagementLegendHDF5IOExt.jl index 0c390ba..f4b44b9 100644 --- a/ext/LegendDataManagementLegendHDF5IOExt.jl +++ b/ext/LegendDataManagementLegendHDF5IOExt.jl @@ -1,15 +1,9 @@ module LegendDataManagementLegendHDF5IOExt -@static if isdefined(Base, :get_extension) - using LegendDataManagement - using LegendHDF5IO -else - using ..LegendDataManagement - using LegendHDF5IO -end +using LegendDataManagement +using LegendHDF5IO # using LegendDataManagement: LegendDataManagement.DataSelector -using LegendHDF5IO const dataselector_bytypes = Dict{Type, String}() diff --git a/src/LegendDataManagement.jl b/src/LegendDataManagement.jl index fbdd0ae..0b17947 100644 --- a/src/LegendDataManagement.jl +++ b/src/LegendDataManagement.jl @@ -51,15 +51,4 @@ include("evt_functions.jl") include("lprops.jl") include("utils/utils.jl") -@static if !isdefined(Base, :get_extension) - using Requires -end - -function __init__() - @static if !isdefined(Base, :get_extension) - @require LegendHDF5IO = "c9265ca6-b027-5446-b1a4-febfa8dd10b0" begin - include("../ext/LegendDataManagementLegendHDF5IOExt.jl") - end - end -end end # module \ No newline at end of file