Merge pull request #29 from bmcfee/release-013

updating docs and version for 0.1.3
pescadores · Jul 28, 2016 · 20b1e91 · 20b1e91
2 parents e453158 + c42f434
commit 20b1e91
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/docs/changes.rst b/docs/changes.rst
@@ -1,6 +1,10 @@
 Changes
 =======
 
+v0.1.3
+------
+- Added support for ``joblib>=0.10``
+
 v0.1.2
 ------
 

diff --git a/docs/example1.rst b/docs/example1.rst
@@ -61,8 +61,9 @@ and adds gaussian noise to the features.
 
             yield dict(X=X[i] + noise, Y=Y[i])
 
-In the code above, `data_stream` is an iterator that can be sampled indefinitely because `noisy_samples`
-contains an infinite loop.  Each iterate of `data_stream` will be a dictionary containing the sample batch's
+
+In the code above, `noisy_samples` is a generator that can be sampled indefinitely because `noisy_samples`
+contains an infinite loop.  Each iterate of `noisy_samples` will be a dictionary containing the sample batch's
 features and labels.
 
 

diff --git a/pescador/version.py b/pescador/version.py
@@ -3,4 +3,4 @@
 """Version info"""
 
 short_version = '0.1'
-version = '0.1.2'
+version = '0.1.3'
diff --git a/setup.py b/setup.py
@@ -29,7 +29,7 @@
     keywords='machine learning',
     license='ISC',
     install_requires=[
-        'joblib',
+        'joblib>=0.9',
         'six',
         'pyzmq',
         'numpy',
-Original file line number
+Diff line change
@@ -1,6 +1,10 @@
     Changes
     =======
+    v0.1.3
+    ------
+    - Added support for ``joblib>=0.10``
     v0.1.2
     ------
@@ Expand Down @@