Skip to content

Commit 66f48c4

Browse files
committed
Merge branch 'main' into stdlibext
2 parents b01d0d9 + 6edcd26 commit 66f48c4

File tree

5 files changed

+10
-56
lines changed

5 files changed

+10
-56
lines changed

Project.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ version = "0.4.4"
66
[deps]
77
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
88
DimensionalData = "0703355e-b756-11e9-17c0-8b28908087d0"
9-
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
10-
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
119
Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
1210

1311
[weakdeps]
@@ -33,7 +31,6 @@ OffsetArrays = "1"
3331
OrderedCollections = "1.6"
3432
PosteriorStats = "0.1.1, 0.2"
3533
Random = "1.9"
36-
Requires = "1.1.0"
3734
StatsBase = "0.33.7, 0.34"
3835
Tables = "1.10.0"
3936
julia = "1.9"

ext/InferenceObjectsMCMCDiagnosticToolsExt/InferenceObjectsMCMCDiagnosticToolsExt.jl

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
module InferenceObjectsMCMCDiagnosticToolsExt
22

33
using Base: @doc
4-
if isdefined(Base, :get_extension)
5-
using DimensionalData: DimensionalData, Dimensions, LookupArrays
6-
using InferenceObjects: InferenceObjects, Random
7-
using MCMCDiagnosticTools: MCMCDiagnosticTools
8-
else # using Requires
9-
using ..DimensionalData: DimensionalData, Dimensions, LookupArrays
10-
using ..InferenceObjects: InferenceObjects, Random
11-
using ..MCMCDiagnosticTools: MCMCDiagnosticTools
12-
end
4+
using DimensionalData: DimensionalData, Dimensions, LookupArrays
5+
using InferenceObjects: InferenceObjects, Random
6+
using MCMCDiagnosticTools: MCMCDiagnosticTools
137

148
include("utils.jl")
159
include("bfmi.jl")

ext/InferenceObjectsNCDatasetsExt/InferenceObjectsNCDatasetsExt.jl

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
module InferenceObjectsNCDatasetsExt
22

3-
if isdefined(Base, :get_extension)
4-
using DimensionalData: DimensionalData, Dimensions, LookupArrays
5-
using NCDatasets: NCDatasets
6-
using InferenceObjects
7-
else
8-
using ..DimensionalData: DimensionalData, Dimensions, LookupArrays
9-
using ..NCDatasets: NCDatasets
10-
using ..InferenceObjects
11-
end
3+
using DimensionalData: DimensionalData, Dimensions, LookupArrays
4+
using NCDatasets: NCDatasets
5+
using InferenceObjects
126

137
function InferenceObjects.from_netcdf(path::AbstractString; kwargs...)
148
return NCDatasets.NCDataset(path, "r"; kwargs...) do ds

ext/InferenceObjectsPosteriorStatsExt/InferenceObjectsPosteriorStatsExt.jl

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
module InferenceObjectsPosteriorStatsExt
22

33
using Base: @doc
4-
if isdefined(Base, :get_extension)
5-
using DimensionalData: DimensionalData, Dimensions, LookupArrays
6-
using InferenceObjects: InferenceObjects
7-
using PosteriorStats: PosteriorStats
8-
using StatsBase: StatsBase
9-
else # using Requires
10-
using ..DimensionalData: DimensionalData, Dimensions, LookupArrays
11-
using ..InferenceObjects: InferenceObjects, stack
12-
using ..PosteriorStats: PosteriorStats
13-
using ..StatsBase: StatsBase
14-
end
4+
using DimensionalData: DimensionalData, Dimensions, LookupArrays
5+
using InferenceObjects: InferenceObjects
6+
using PosteriorStats: PosteriorStats
7+
using StatsBase: StatsBase
158

169
include("utils.jl")
1710
include("hdi.jl")

src/InferenceObjects.jl

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ using DimensionalData: DimensionalData, Dimensions, LookupArrays
55
using Random: Random
66
using Tables: Tables
77

8-
const EXTENSIONS_SUPPORTED = isdefined(Base, :get_extension)
9-
108
# groups that are officially listed in the schema
119
const SCHEMA_GROUPS = (
1210
:posterior,
@@ -46,29 +44,7 @@ include("from_namedtuple.jl")
4644
include("from_dict.jl")
4745
include("io.jl")
4846

49-
if !EXTENSIONS_SUPPORTED
50-
using Requires: @require
51-
end
5247
function __init__()
53-
@static if !EXTENSIONS_SUPPORTED
54-
@require MCMCDiagnosticTools = "be115224-59cd-429b-ad48-344e309966f0" begin
55-
@require Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" begin
56-
include(
57-
"../ext/InferenceObjectsMCMCDiagnosticToolsExt/InferenceObjectsMCMCDiagnosticToolsExt.jl",
58-
)
59-
end
60-
end
61-
@require NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab" begin
62-
include("../ext/InferenceObjectsNCDatasetsExt/InferenceObjectsNCDatasetsExt.jl")
63-
end
64-
@require PosteriorStats = "7f36be82-ad55-44ba-a5c0-b8b5480d7aa5" begin
65-
@require StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" begin
66-
include(
67-
"../ext/InferenceObjectsPosteriorStatsExt/InferenceObjectsPosteriorStatsExt.jl",
68-
)
69-
end
70-
end
71-
end
7248
if isdefined(Base.Experimental, :register_error_hint)
7349
Base.Experimental.register_error_hint(MethodError) do io, exc, argtypes, kwargs
7450
if exc.f === from_netcdf &&

0 commit comments

Comments
 (0)