Update and fix UT for latest pytest version (ubuntu)

preligens-lab · Aug 12, 2020 · ef9dbb9 · ef9dbb9
1 parent 0fac7bb
commit ef9dbb9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/buzzard/_tools/parameters.py b/buzzard/_tools/parameters.py
@@ -99,7 +99,7 @@ def normalize_channels_parameter(channels, channel_count):
         else:
             return list(range(channel_count)), False
     elif not isinstance(channels, slice):
-        channels = list(channels)
+        channels = np.asarray(channels).tolist()
 
     indices = np.arange(channel_count)
     indices = indices[channels]

diff --git a/requirements-ci.txt b/requirements-ci.txt
@@ -3,7 +3,7 @@ gdal==2.4.0
 
 coverage>=4.4.1
 codecov>=2.0.15
-pytest==3.6.4
+pytest>=3.6.4
 attrdict>=2.0.0
 pytest-cov>=2.5.1
 pylint>=1.7.1

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,7 +1,7 @@
 -e .
 coverage>=4.4.1
 codecov>=2.0.15
-pytest==3.6.4
+pytest>=3.6.4
 attrdict>=2.0.0
 pytest-cov>=2.5.1
 pylint>=1.7.1

diff --git a/scripts/pytest_parallel.py b/scripts/pytest_parallel.py
@@ -72,12 +72,13 @@ def _gen_tests():
 
     m = None
     for l in res.split('\n'):
-        if l.startswith("<Module '"):
-            m = l.replace("<Module '", '')[:-2]
-        elif l.startswith("  <Function '"):
+        l = l.strip()
+        if l.startswith("<Module "):
+            m = l.replace("<Module ", '')[:-1]
+        elif l.startswith("<Function "):
             assert m is not None, l
-            f = l.replace("  <Function '", '')[:-2]
-            d[m].append(f)
+            f = l.replace("<Function ", '')[:-1]
+            d[os.path.join("buzzard", "test", m)].append(f)
         else:
             pass