From 519321ac182285518467b6f59a836aedd1215634 Mon Sep 17 00:00:00 2001 From: Brian McFee Date: Thu, 28 Jul 2016 11:49:33 -0400 Subject: [PATCH 1/2] updating docs and version for 0.1.3 --- docs/changes.rst | 4 ++++ pescador/version.py | 2 +- setup.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/changes.rst b/docs/changes.rst index ba285a8..53475ed 100644 --- 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/pescador/version.py b/pescador/version.py index acaaf1f..20f3f16 100644 --- 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 index d53c607..8253e0b 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ keywords='machine learning', license='ISC', install_requires=[ - 'joblib', + 'joblib>=0.9', 'six', 'pyzmq', 'numpy', From c42f43404affcd209cac8496bac954ab7a51bde7 Mon Sep 17 00:00:00 2001 From: Brian McFee Date: Thu, 28 Jul 2016 11:53:57 -0400 Subject: [PATCH 2/2] updated docs to fix #24 --- docs/example1.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/example1.rst b/docs/example1.rst index dad83ba..c13bd4b 100644 --- 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.