Fix package import issues.

README.rst

@@ -69,7 +69,7 @@ To fit a mixed vine to the samples:
 
 .. code-block:: python
 
-    from mixedvine import MixedVine
+    from mixedvines.mixedvine import MixedVine
     vine = MixedVine.fit(samples, is_continuous)
 
 ``vine`` is now a ``MixedVine`` object.  To draw samples from the distribution,
@@ -158,7 +158,7 @@ References
 License
 -------
 
-Copyright (C) 2017 Arno Onken
+Copyright (C) 2017, 2018 Arno Onken
 
 This file is part of the mixedvines package.
 

docs/conf.py

@@ -68,17 +68,17 @@ def __getattr__(cls, name):
 
 # General information about the project.
 project = u'mixedvines'
-copyright = u'2017, Arno Onken'
+copyright = u'2017, 2018 Arno Onken'
 author = u'Arno Onken'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = u'1.0'
+version = u'1.2'
 # The full version, including alpha/beta/rc tags.
-release = u'1.0'
+release = u'1.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -152,7 +152,7 @@ def __getattr__(cls, name):
 # The name for this set of Sphinx documents.
 # "<project> v<release> documentation" by default.
 #
-# html_title = u'mixedvines v1.0'
+# html_title = u'mixedvines v1.2.0'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #

docs/usage.rst

@@ -16,7 +16,7 @@ To fit a mixed vine to the samples:
 
 .. code-block:: python
 
-    from mixedvine import MixedVine
+    from mixedvines.mixedvine import MixedVine
     vine = MixedVine.fit(samples, is_continuous)
 
 ``vine`` is now a ``MixedVine`` object.  Note that for the canonical vine, the

mixedvines/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2017 Arno Onken
+# Copyright (C) 2017, 2018 Arno Onken
 #
 # This file is part of the mixedvines package.
 #
@@ -14,3 +14,8 @@
 #
 # You should have received a copy of the GNU General Public License along with
 # this program.  If not, see <http://www.gnu.org/licenses/>.
+from __future__ import absolute_import
+from . import marginal
+from . import copula
+from . import mixedvine
+from .mixedvine import MixedVine

mixedvines/mixedvine.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2017 Arno Onken
+# Copyright (C) 2017, 2018 Arno Onken
 #
 # This file is part of the mixedvines package.
 #
@@ -18,12 +18,13 @@
 '''
 This module implements a copula vine model with mixed marginals.
 '''
+from __future__ import absolute_import
 from __future__ import division
 from scipy.stats import norm, kendalltau
 from scipy.optimize import minimize
 import numpy as np
-from mixedvines.marginal import Marginal
-from mixedvines.copula import Copula, IndependenceCopula
+from .marginal import Marginal
+from .copula import Copula, IndependenceCopula
 
 
 class MixedVine(object):

setup.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2017 Arno Onken
+# Copyright (C) 2017, 2018 Arno Onken
 #
 # This file is part of the mixedvines package.
 #
@@ -21,7 +21,7 @@
 
 setup(
     name="mixedvines",
-    version="1.1",
+    version="1.2.0",
     description=("Package for canonical vine copula trees with mixed"
                  " continuous and discrete marginals."),
     long_description=open('README.rst').read(),