Skip to content

Commit 7fefadd

Browse files
committed
Merge branch 'release/1.3.0' into develop
2 parents 3a4171b + 837f29f commit 7fefadd

File tree

4 files changed

+30
-0
lines changed

4 files changed

+30
-0
lines changed

cluster/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
#
1717

1818

19+
from pkg_resources import resource_string
20+
1921
from .method.hierarchical import HierarchicalClustering
2022
from .method.kmeans import KMeansClustering
2123
from .util import ClusteringError
24+
25+
__version__ = resource_string('cluster', 'version.txt').decode('ascii').strip()

cluster/version.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.3.0

docs/changelog.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Changelog
2+
=========
3+
4+
Release 1.3.0
5+
-------------
6+
7+
* Performance improvments for hierarchical clustering (at the cost of memory)
8+
* Cluster instances are now iterable.It will iterate over each element,
9+
resulting in a flat list of items.
10+
* New option to specify a progress method. This method will be called on each
11+
iteration for hierarchical clusters. It gives users a way to present to
12+
progress on screen.
13+
* The library now also has a ``__version__`` member.

docs/index.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
Welcome to python-cluster's documentation!
22
==========================================
33

4+
Index
5+
-----
6+
7+
.. toctree::
8+
:maxdepth: 1
9+
10+
changelog
11+
12+
13+
Introduction
14+
------------
15+
416
Implementation of cluster algorithms in pure Python.
517

618
As this is exacuted in the Python runtime, the code runs slower than similar

0 commit comments

Comments
 (0)