Merge branch 'juerg/python3.7' into 'master'

Python 3.7 support

See merge request BuildStream/buildstream!615

2 files changed, 6 insertions, 4 deletions

diff --git a/buildstream/_artifactcache/cascache.py b/buildstream/_artifactcache/cascache.py
index 1b2dc198f..c4b3688d4 100644
--- a/buildstream/_artifactcache/cascache.py
+++ b/buildstream/_artifactcache/cascache.py
@@ -846,6 +846,9 @@ class _CASRemote():
 
 
 def _grouper(iterable, n):
-    # pylint: disable=stop-iteration-return
     while True:
-        yield itertools.chain([next(iterable)], itertools.islice(iterable, n - 1))
+        try:
+            current = next(iterable)
+        except StopIteration:
+            return
+        yield itertools.chain([current], itertools.islice(iterable, n - 1))
diff --git a/setup.py b/setup.py
index 0be02dfa1..efa4ebc1e 100755
--- a/setup.py
+++ b/setup.py
@@ -272,6 +272,5 @@ setup(name='BuildStream',
                      'pytest-cov >= 2.5.0',
                      # Provide option to run tests in parallel, less reliable
                      'pytest-xdist',
-                     'pytest >= 3.1.0',
-                     'pylint >= 1.8 , < 2'],
+                     'pytest >= 3.1.0'],
       zip_safe=False)