Merge pull request #966 from vdumoulin/update_progressbar

Update progressbar2 required version, fix maxval bug and make sure te…
mila-iqia · Jan 29, 2016 · d9930cd · d9930cd
2 parents b7a7805 + 6835428
commit d9930cd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/blocks/extensions/__init__.py b/blocks/extensions/__init__.py
@@ -484,7 +484,7 @@ def create_bar(self):
                        progressbar.Timer(), ' ', progressbar.ETA()]
 
         return progressbar.ProgressBar(widgets=widgets,
-                                       maxval=iter_per_epoch)
+                                       max_value=iter_per_epoch)
 
     def before_epoch(self):
         self.iter_count = 0

diff --git a/req-rtd.txt b/req-rtd.txt
@@ -1,5 +1,5 @@
 picklable-itertools==0.1.1
-progressbar2==2.7.3
+progressbar2==3.6.0
 pyyaml==3.11
 six==1.9.0
 toolz==0.7.2

diff --git a/req-travis-pip.txt b/req-travis-pip.txt
@@ -1,7 +1,7 @@
 coveralls==1.0
 nose2[coverage-plugin]==0.5.0
 picklable-itertools==0.1.1
-progressbar2==2.7.3
+progressbar2==3.6.0
 
 --allow-external theano
 --allow-unverified theano

diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
 numpy==1.9.3
 picklable-itertools==0.1.1
-progressbar2==2.7.3
+progressbar2==3.6.0
 pyyaml==3.11
 six==1.9.0
 toolz==0.7.2

diff --git a/tests/extensions/test_progressbar.py b/tests/extensions/test_progressbar.py
@@ -16,8 +16,12 @@ def setup_mainloop(extension):
     DataStream and a minimal model/cost to optimize.
 
     """
+    # Since progressbar2 3.6.0, the `maxval` kwarg has been replaced by
+    # `max_value`, which has a default value of 100. If we're still using
+    # `maxval` by accident, this test should fail complaining that
+    # the progress bar has received a value out of range.
     features = [numpy.array(f, dtype=theano.config.floatX)
-                for f in [[1, 2], [3, 4], [5, 6]]]
+                for f in [[1, 2]] * 101]
     dataset = IterableDataset(dict(features=features))
 
     W = shared_floatx([0, 0], name='W')