Merge pull request #40 from sinhrks/v2.0

sinhrks · sinhrks · commit 708d68d90897 · 2015-09-12T23:26:22.000+09:00
REL: v2.0.0
diff --git a/README.rst b/README.rst
@@ -1,8 +1,8 @@
 pandas-ml
 =========
 
-.. image:: https://pypip.in/version/expandas/badge.svg
-    :target: https://pypi.python.org/pypi/expandas/
+.. image:: https://pypip.in/version/pandas_ml/badge.svg
+    :target: https://pypi.python.org/pypi/pandas_ml/
     :alt: Latest Version
 
 .. image:: https://readthedocs.org/projects/pandas-ml/badge/?version=latest
@@ -17,6 +17,14 @@ Overview
 
 Expand pandas functionalities to be easier to use other statistics/ML packages, mainly forcusing on scikit-learn.
 
+Installation
+~~~~~~~~~~~~
+
+.. code-block::
+
+    $ pip install pandas_ml
+
+
 Documentation
 ~~~~~~~~~~~~~
 
diff --git a/pandas_ml/skaccessors/test/test_semi_supervised.py b/pandas_ml/skaccessors/test/test_semi_supervised.py
@@ -7,20 +7,20 @@
 import sklearn.datasets as datasets
 import sklearn.semi_supervised as ss
 
-import pandas_ml as expd
+import pandas_ml as pdml
 import pandas_ml.util.testing as tm
 
 
 class TestSemiSupervised(tm.TestCase):
 
     def test_objectmapper(self):
-        df = expd.ModelFrame([])
+        df = pdml.ModelFrame([])
         self.assertIs(df.semi_supervised.LabelPropagation, ss.LabelPropagation)
         self.assertIs(df.semi_supervised.LabelSpreading, ss.LabelSpreading)
 
     def test_Classifications(self):
         iris = datasets.load_iris()
-        df = expd.ModelFrame(iris)
+        df = pdml.ModelFrame(iris)
 
         models = ['LabelPropagation', 'LabelSpreading']
         for model in models:
@@ -33,7 +33,7 @@ def test_Classifications(self):
             result = df.predict(mod1)
             expected = mod2.predict(iris.data)
 
-            self.assertTrue(isinstance(result, expd.ModelSeries))
+            self.assertTrue(isinstance(result, pdml.ModelSeries))
             self.assert_numpy_array_almost_equal(result.values, expected)
 
 
diff --git a/pandas_ml/version.py b/pandas_ml/version.py
@@ -1 +1 @@
-version = '0.2.0dev'
+version = '0.2.0'
diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 README = 'README.rst'
 REQUIREMENTS = 'requirements.txt'
 
-VERSION = '0.2.0dev'
+VERSION = '0.2.0'
 
 def read(fname):
   # file must be read as utf-8 in py3 to avoid to be bytes

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-version = '0.2.0dev'`
	`1`	`+version = '0.2.0'`