rebase into master

Author: erdogant

README.md

@@ -15,7 +15,6 @@ Have fun!
 
 Treeplot can plot the tree for Random-forest, decission trees, xgboost and gradient boosting models:
   * treeplot.plot()         : Generic function to plot the tree of any of the four models with default settings
-  * treeplot.plot_tree()    : Plot the decission tree model. Parameters can be specified.
   * treeplot.randomforest() : Plot the randomforest model. Parameters can be specified.
   * treeplot.xgboost()      : Plot the xgboost model. Parameters can be specified.
   * treeplot.import_example('iris') : Import example dataset

requirements_dev.txt

@@ -0,0 +1 @@
+pytest

treeplot/__init__.py

@@ -8,7 +8,7 @@
 
 __author__ = 'Erdogan Tasksen'
 __email__ = '[email protected]'
-__version__ = '0.1.13'
+__version__ = '0.1.14'
 
 # module level doc-string
 __doc__ = """

treeplot/treeplot.py

@@ -13,7 +13,8 @@
 import zipfile
 import numpy as np
 from sklearn.tree import export_graphviz
-from sklearn.tree.export import export_text
+# from sklearn.tree.export import export_text
+from sklearn.tree import export_text
 from subprocess import call
 import matplotlib.image as mpimg
 import matplotlib.pyplot as plt