Merge branch 'master' into develop

.gitignore

@@ -109,7 +109,7 @@ ENV/
 
 # Pypi
 /dist
-=======
+
 # datasets folder
 data/
 

HISTORY.rst

@@ -2,7 +2,11 @@
 History
 =======
 
-0.1.0 (2018-05-29)
+0.2.0 (2018-12-19)
 ------------------
 
-* First release on PyPI.
+* Second release on PyPI.
+* Added Hierarchical clustering
+* Added Louvain clustering
+* Added Forward-backward embedding
+* Added basic loaders and toy graphs

requirements_dev.txt

@@ -1,12 +1,14 @@
-pip==18.1
+pip==19.0.3
 bumpversion==0.5.3
-wheel==0.32.3
+wheel==0.33.1
 watchdog==0.9.0
-flake8==3.6.0
-tox==3.6.0
-coverage==4.5.2
-Sphinx==1.8.2
-twine==1.12.1
+flake8==3.7.7
+tox==3.7.0
+Sphinx==1.8.5
+coverage==4.5.3
+twine==1.13.0
+
+
+pytest-runner==4.4
+pytest==4.3.1
 
-pytest==4.0.2
-pytest-runner==4.2

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.1.1
+current_version = 0.2.0
 commit = True
 tag = True
 

sknetwork/__init__.py

@@ -11,4 +11,4 @@
 from sknetwork.loader import *
 from sknetwork.clustering import *
 from sknetwork.hierarchy import *
-from sknetwork.embedding import *
+from sknetwork.embedding import *

sknetwork/toy_graphs/test/test_graph_imports.py

@@ -1,15 +1,10 @@
 # -*- coding: utf-8 -*-
 # test for graph_data.py
-#
-# Copyright 2018 Scikit-network Developers.
-# Copyright 2018 Quentin Lutz <[email protected]>, Nathan de Lara <[email protected]>
-#
-# This file is part of Scikit-network.
+# authors: Quentin Lutz <[email protected]>, Nathan de Lara <[email protected]>
 
 import unittest
 from sknetwork.toy_graphs.graph_data import karate_club_graph, star_wars_villains_graph
 
-
 class TestGraphImport(unittest.TestCase):
 
     def setUp(self):