Fixed __init__ and migrated to setuptools

jfsantos · Apr 30, 2015 · 6749ccc · 6749ccc
1 parent d476ae6
commit 6749ccc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/gmr/__init__.py b/gmr/__init__.py
@@ -4,10 +4,10 @@
 
 Gaussian Mixture Models (GMMs) for clustering and regression in Python.
 """
-from mvn import MVN, plot_error_ellipse
-from gmm import GMM, plot_error_ellipses
-
 
 __version__ = "1.1-git"
 
-__all__ = ["GMM", "MVN", "plot_error_ellipse", "plot_error_ellipses"]
+__all__ = ['gmm', 'mvn', 'utils']
+
+from .mvn import MVN, plot_error_ellipse
+from .gmm import GMM, plot_error_ellipses
diff --git a/setup.py b/setup.py
@@ -3,15 +3,12 @@
 # Author: Alexander Fabisch <afabisch@googlemail.com>
 # License: BSD 3 clause
 
-
-from distutils.core import setup
-import gmr
-
+from setuptools import setup
 
 def setup_package():
     setup(
         name="gmr",
-        version=gmr.__version__,
+        version="1.1-git",
         author="Alexander Fabisch",
         author_email="afabisch@googlemail.com",
         url="https://github.com/AlexanderFabisch/gmr",