Merge remote-tracking branch 'upstream/master'

mila-iqia · May 19, 2015 · 0556b46 · 0556b46
2 parents b8e9507 + 34820b8
commit 0556b46
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/req-travis-conda.txt b/req-travis-conda.txt
@@ -1,4 +1,4 @@
-bokeh==0.8.2
+bokeh==0.9.0
 coverage==3.7.1
 h5py==2.5.0
 numpy==1.9.2

diff --git a/requirements.txt b/requirements.txt
@@ -4,10 +4,7 @@ pandas==0.16.1
 progressbar2==2.7.3
 PyYaml==3.11
 toolz==0.7.2
-
---allow-external picklable-itertools
---allow-unverified picklable-itertools
-git+https://github.com/dwf/picklable_itertools.git#egg=picklable-itertools
+picklable-itertools==0.1.0
 
 --allow-external theano
 --allow-unverified theano