Skip to content

Commit

Permalink
Depend on and export InferenceObjects (#220)
Browse files Browse the repository at this point in the history
* Add InferenceObjects as dependency

* Remove InferenceObjects module

* Load OrderedCollections

* Increment version number

* Add module to docs build

* Separate out InferenceObjects exports
  • Loading branch information
sethaxen authored Aug 17, 2022
1 parent e0c6e6f commit 50950ea
Show file tree
Hide file tree
Showing 22 changed files with 18 additions and 1,737 deletions.
4 changes: 3 additions & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
name = "ArviZ"
uuid = "131c737c-5715-5e2e-ad31-c244f01c1dc7"
authors = ["Seth Axen <[email protected]>"]
version = "0.6.2"
version = "0.6.3"

[deps]
Conda = "8f4d0f93-b110-5947-807f-2305c1781a2d"
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
DimensionalData = "0703355e-b756-11e9-17c0-8b28908087d0"
InferenceObjects = "b5cf5a8d-e756-4ee3-b014-01d49d192c00"
LogExpFunctions = "2ab3a3ac-af41-5b50-aa03-7779005ae688"
Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
Expand All @@ -22,6 +23,7 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
Conda = "1.0"
DataFrames = "0.20, 0.21, 0.22, 1.0"
DimensionalData = "0.20, 0.21"
InferenceObjects = "0.1"
LogExpFunctions = "0.2.0, 0.3"
OrderedCollections = "1"
PSIS = "0.2, 0.3, 0.4, 0.5"
Expand Down
2 changes: 1 addition & 1 deletion docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ download_asset("ArviZ_white.png", "logo-dark.png")
download_asset("favicon.ico")

makedocs(;
modules=[ArviZ, PSIS],
modules=[ArviZ, InferenceObjects, PSIS],
sitename="ArviZ.jl",
pages=[
"Home" => "index.md",
Expand Down
26 changes: 13 additions & 13 deletions src/ArviZ.jl
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,12 @@ import StatsBase: summarystats
import Markdown: @doc_str
import PyCall: PyObject

include("InferenceObjects/InferenceObjects.jl")

using .InferenceObjects
import .InferenceObjects: convert_to_inference_data, namedtuple_of_arrays
using InferenceObjects
import InferenceObjects: convert_to_inference_data, namedtuple_of_arrays
# internal functions temporarily used/extended here
using .InferenceObjects:
using InferenceObjects:
attributes, flatten, groupnames, groups, hasgroup, rekey, setattribute!
import .InferenceObjects: namedtuple_of_arrays
import InferenceObjects: namedtuple_of_arrays

# Exports

Expand Down Expand Up @@ -79,20 +77,22 @@ export bfmi, ess, rhat, mcse

## Stats utils
export autocov, autocorr, make_ufunc, wrap_xarray_ufunc
## Dataset
export Dataset, convert_to_dataset, namedtuple_to_dataset

## InferenceData
export InferenceData
## InferenceObjects
export InferenceObjects,
Dataset,
InferenceData,
convert_to_dataset,
convert_to_inference_data,
from_namedtuple,
namedtuple_to_dataset

## Data
export convert_to_inference_data,
extract_dataset,
export extract_dataset,
load_arviz_data,
to_netcdf,
from_json,
from_netcdf,
from_namedtuple,
from_dict,
from_cmdstan,
from_mcmcchains,
Expand Down
40 changes: 0 additions & 40 deletions src/InferenceObjects/InferenceObjects.jl

This file was deleted.

19 changes: 0 additions & 19 deletions src/InferenceObjects/convert_dataset.jl

This file was deleted.

90 changes: 0 additions & 90 deletions src/InferenceObjects/convert_inference_data.jl

This file was deleted.

128 changes: 0 additions & 128 deletions src/InferenceObjects/dataset.jl

This file was deleted.

Loading

2 comments on commit 50950ea

@sethaxen
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/66446

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.6.3 -m "<description of version>" 50950ea27d65c65e72b0bad646f78c57c099b340
git push origin v0.6.3

Please sign in to comment.