Merge branch 'release/1.4.0'

Author: exhuma

CHANGELOG

@@ -1,3 +1,6 @@
+1.4.0
+   - Added a "display" method to hierarchical clusters (by 1kastner).
+
 1.2.1
    - Fixed an issue in multiprocessing code.
 

cluster/method/hierarchical.py

@@ -206,3 +206,14 @@ def getlevel(self, threshold):
             self.cluster()
 
         return self._data[0].getlevel(threshold)
+        
+    def display(self):
+        """
+        Prints a simple dendogram-like representation of the full cluster
+        to the console.
+        """
+        # initialize the cluster if not yet done
+        if not self.__cluster_created:
+            self.cluster()
+
+        self._data[0].display()

cluster/test/test_hierarchical.py

@@ -66,13 +66,6 @@ def testClusterLen0(self):
 
 class HClusterIntegerTestCase(Py23TestCase):
 
-    def __init__(self, *args, **kwargs):
-        super(HClusterIntegerTestCase, self).__init__(*args, **kwargs)
-        if hexversion < 0x030000f0:
-            self.assertCItemsEqual = self.assertItemsEqual
-        else:
-            self.assertCItemsEqual = self.assertCountEqual
-
     def setUp(self):
         self.__data = [791, 956, 676, 124, 564, 84, 24, 365, 594, 940, 398,
                        971, 131, 365, 542, 336, 518, 835, 134, 391]

cluster/version.txt

@@ -1 +1 @@
-1.3.3
+1.4.0

pytest.ini

@@ -1,2 +1,3 @@
 [pytest]
+looponfailroots = cluster
 norecursedirs = env env3 env3_nonumpy .git