Skip to content

Commit

Permalink
Merge abde546 into a278d0b
Browse files Browse the repository at this point in the history
  • Loading branch information
canyon289 committed Sep 19, 2018
2 parents a278d0b + abde546 commit e255d1d
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
8 changes: 6 additions & 2 deletions arviz/data/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#pylint: disable=wildcard-import
"""Code for loading and manipulating data structures."""
from .inference_data import InferenceData
from .io import load_data, save_data, load_arviz_data
from .convert import *
from .io_netcdf import load_data, save_data, load_arviz_data
from .converters import *
from .base import numpy_to_data_array, dict_to_dataset
from .converters import convert_to_dataset, convert_to_inference_data
from .io_pymc3 import from_pymc3
from .io_pystan import from_pystan
File renamed without changes.
5 changes: 0 additions & 5 deletions arviz/data/convert/__init__.py

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import numpy as np
import xarray as xr

from ..inference_data import InferenceData
from .inference_data import InferenceData
from .base import dict_to_dataset
from .io_pymc3 import from_pymc3
from .io_pystan import from_pystan
Expand Down
2 changes: 1 addition & 1 deletion arviz/data/io.py → arviz/data/io_netcdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import os

from .inference_data import InferenceData
from .convert import convert_to_inference_data
from .converters import convert_to_inference_data


def load_data(filename):
Expand Down
2 changes: 1 addition & 1 deletion arviz/data/convert/io_pymc3.py → arviz/data/io_pymc3.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import numpy as np
import xarray as xr

from ..inference_data import InferenceData
from .inference_data import InferenceData
from .base import requires, dict_to_dataset, generate_dims_coords

class PyMC3Converter:
Expand Down
3 changes: 2 additions & 1 deletion arviz/data/convert/io_pystan.py → arviz/data/io_pystan.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
import numpy as np
import xarray as xr

from ..inference_data import InferenceData
from .inference_data import InferenceData
from .base import requires, dict_to_dataset, generate_dims_coords


class PyStanConverter:
"""Encapsulate PyStan specific logic."""

Expand Down

0 comments on commit e255d1d

Please sign in to comment.