diff --git a/Project.toml b/Project.toml index e606e2bf..625f3e52 100644 --- a/Project.toml +++ b/Project.toml @@ -1,13 +1,11 @@ name = "InferenceObjects" uuid = "b5cf5a8d-e756-4ee3-b014-01d49d192c00" authors = ["Seth Axen and contributors"] -version = "0.4.3" +version = "0.4.4" [deps] Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" DimensionalData = "0703355e-b756-11e9-17c0-8b28908087d0" -Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" -Requires = "ae029012-a4dd-5104-9daa-d747884805df" Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" [weakdeps] @@ -34,7 +32,6 @@ OffsetArrays = "1" OrderedCollections = "1.6" PosteriorStats = "0.1.1, 0.2" Random = "1.9" -Requires = "1.1.0" StatsBase = "0.33.7, 0.34" Tables = "1.10.0" julia = "1.9" diff --git a/ext/InferenceObjectsMCMCDiagnosticToolsExt/InferenceObjectsMCMCDiagnosticToolsExt.jl b/ext/InferenceObjectsMCMCDiagnosticToolsExt/InferenceObjectsMCMCDiagnosticToolsExt.jl index dc5e06b9..788e726b 100644 --- a/ext/InferenceObjectsMCMCDiagnosticToolsExt/InferenceObjectsMCMCDiagnosticToolsExt.jl +++ b/ext/InferenceObjectsMCMCDiagnosticToolsExt/InferenceObjectsMCMCDiagnosticToolsExt.jl @@ -1,17 +1,10 @@ module InferenceObjectsMCMCDiagnosticToolsExt using Base: @doc -if isdefined(Base, :get_extension) - using DimensionalData: DimensionalData, Dimensions, LookupArrays - using InferenceObjects: InferenceObjects - using MCMCDiagnosticTools: MCMCDiagnosticTools - using Random: Random -else # using Requires - using ..DimensionalData: DimensionalData, Dimensions, LookupArrays - using ..InferenceObjects: InferenceObjects - using ..MCMCDiagnosticTools: MCMCDiagnosticTools - using ..Random: Random -end +using DimensionalData: DimensionalData, Dimensions, LookupArrays +using InferenceObjects: InferenceObjects +using MCMCDiagnosticTools: MCMCDiagnosticTools +using Random: Random include("utils.jl") include("bfmi.jl") diff --git a/ext/InferenceObjectsNCDatasetsExt/InferenceObjectsNCDatasetsExt.jl b/ext/InferenceObjectsNCDatasetsExt/InferenceObjectsNCDatasetsExt.jl index 73453b4b..4edbeb68 100644 --- a/ext/InferenceObjectsNCDatasetsExt/InferenceObjectsNCDatasetsExt.jl +++ b/ext/InferenceObjectsNCDatasetsExt/InferenceObjectsNCDatasetsExt.jl @@ -1,14 +1,8 @@ module InferenceObjectsNCDatasetsExt -if isdefined(Base, :get_extension) - using DimensionalData: DimensionalData, Dimensions, LookupArrays - using NCDatasets: NCDatasets - using InferenceObjects -else - using ..DimensionalData: DimensionalData, Dimensions, LookupArrays - using ..NCDatasets: NCDatasets - using ..InferenceObjects -end +using DimensionalData: DimensionalData, Dimensions, LookupArrays +using NCDatasets: NCDatasets +using InferenceObjects function InferenceObjects.from_netcdf(path::AbstractString; kwargs...) return NCDatasets.NCDataset(path, "r"; kwargs...) do ds diff --git a/ext/InferenceObjectsPosteriorStatsExt/InferenceObjectsPosteriorStatsExt.jl b/ext/InferenceObjectsPosteriorStatsExt/InferenceObjectsPosteriorStatsExt.jl index 69ac5cfe..48bfe321 100644 --- a/ext/InferenceObjectsPosteriorStatsExt/InferenceObjectsPosteriorStatsExt.jl +++ b/ext/InferenceObjectsPosteriorStatsExt/InferenceObjectsPosteriorStatsExt.jl @@ -1,17 +1,10 @@ module InferenceObjectsPosteriorStatsExt using Base: @doc -if isdefined(Base, :get_extension) - using DimensionalData: DimensionalData, Dimensions, LookupArrays - using InferenceObjects: InferenceObjects - using PosteriorStats: PosteriorStats - using StatsBase: StatsBase -else # using Requires - using ..DimensionalData: DimensionalData, Dimensions, LookupArrays - using ..InferenceObjects: InferenceObjects, stack - using ..PosteriorStats: PosteriorStats - using ..StatsBase: StatsBase -end +using DimensionalData: DimensionalData, Dimensions, LookupArrays +using InferenceObjects: InferenceObjects +using PosteriorStats: PosteriorStats +using StatsBase: StatsBase include("utils.jl") include("hdi.jl") diff --git a/src/InferenceObjects.jl b/src/InferenceObjects.jl index 903927f8..6315e298 100644 --- a/src/InferenceObjects.jl +++ b/src/InferenceObjects.jl @@ -4,8 +4,6 @@ using Dates: Dates using DimensionalData: DimensionalData, Dimensions, LookupArrays using Tables: Tables -const EXTENSIONS_SUPPORTED = isdefined(Base, :get_extension) - # groups that are officially listed in the schema const SCHEMA_GROUPS = ( :posterior, @@ -45,29 +43,7 @@ include("from_namedtuple.jl") include("from_dict.jl") include("io.jl") -if !EXTENSIONS_SUPPORTED - using Requires: @require -end function __init__() - @static if !EXTENSIONS_SUPPORTED - @require MCMCDiagnosticTools = "be115224-59cd-429b-ad48-344e309966f0" begin - @require Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" begin - include( - "../ext/InferenceObjectsMCMCDiagnosticToolsExt/InferenceObjectsMCMCDiagnosticToolsExt.jl", - ) - end - end - @require NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab" begin - include("../ext/InferenceObjectsNCDatasetsExt/InferenceObjectsNCDatasetsExt.jl") - end - @require PosteriorStats = "7f36be82-ad55-44ba-a5c0-b8b5480d7aa5" begin - @require StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" begin - include( - "../ext/InferenceObjectsPosteriorStatsExt/InferenceObjectsPosteriorStatsExt.jl", - ) - end - end - end if isdefined(Base.Experimental, :register_error_hint) Base.Experimental.register_error_hint(MethodError) do io, exc, argtypes, kwargs if exc.f === from_netcdf &&