Fix continuous integration

.flake8

@@ -6,8 +6,13 @@ verbose = 2
 # https://pep8.readthedocs.io/en/latest/intro.html#error-codes
 format = pylint
 ignore =
-    E731  # E731 - Do not assign a lambda expression, use a def
-    W605  # W605 - invalid escape sequence '\_'. Needed for docs
-    W504  # W504 - line break after binary operator
-    W503  # W503 - line break before binary operator, need for black
-    E203  # E203 - whitespace before ':'. Opposite convention enforced by black
+    # E731 - Do not assign a lambda expression, use a def
+    E731
+    # W605 - invalid escape sequence '\_'. Needed for docs
+    W605
+    # W504 - line break after binary operator
+    W504
+    # W503 - line break before binary operator, need for black
+    W503
+    # E203 - whitespace before ':'. Opposite convention enforced by black
+    E203

.github/workflows/test_asteroid_package.yml

@@ -47,14 +47,14 @@ jobs:
 
     - name: Source code tests
       run: |
-        coverage run -a -m py.test tests  --ignore tests/models/publish_test.py
+        coverage run -a -m pytest tests  --ignore tests/models/publish_test.py
         chmod +x ./tests/cli_test.sh
         ./tests/cli_test.sh
 
     # This tends to fail despite the code works, when Zenodo is slow.
     - name: Model-sharing tests
       run: |
-        coverage run -a -m py.test tests/models/publish_test.py
+        coverage run -a -m pytest tests/models/publish_test.py
       env:
         ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
 

asteroid/dsp/overlap_add.py

@@ -55,7 +55,7 @@ def __init__(
         n_src,
         window_size,
         hop_size=None,
-        window="hanning",
+        window="hann",
         reorder_chunks=True,
         enable_grad=False,
     ):

requirements/install.txt

@@ -2,7 +2,8 @@
 -r ./torchhub.txt
 PyYAML>=5.0
 pandas>=0.23.4
-pytorch-lightning>=1.5.0,<2.0.0 
+pytorch-lightning>=1.5.0,<=1.7.7
+torchmetrics<=0.11.4
 torchaudio>=0.8.0
 pb_bss_eval>=0.0.2
 torch_stoi>=0.0.1

requirements/torchhub.txt

@@ -1,7 +1,7 @@
 # Minimal set of requirements required to be able to run Asteroid models from Torch Hub.
 # Note that Asteroid itself is not required to be installed.
 numpy>=1.16.4
-scipy>=1.1.0
+scipy>=1.10.1
 torch>=1.8.0,<2.0.0
 asteroid-filterbanks>=0.4.0
 requests

setup.py

@@ -38,15 +38,16 @@ def find_version(*file_paths):
     install_requires=[
         # From requirements/torchhub.txt
         "numpy>=1.16.4",
-        "scipy>=1.1.0",
+        "scipy>=1.10.1",
         "torch>=1.8.0,<2.0.0",
         "asteroid-filterbanks>=0.4.0",
         "SoundFile>=0.10.2",
         "huggingface_hub>=0.0.2",
         # From requirements/install.txt
         "PyYAML>=5.0",
         "pandas>=0.23.4",
-        "pytorch-lightning>=1.5.0,<2.0.0",
+        "pytorch-lightning>=1.5.0,<=1.7.7",
+        "torchmetrics<=0.11.4",
         "torchaudio>=0.5.0",
         "pb_bss_eval>=0.0.2",
         "torch_stoi>=0.1.2",

tests/dsp/overlap_add_test.py

@@ -8,7 +8,7 @@
 @pytest.mark.parametrize("length", [1390, 8372])
 @pytest.mark.parametrize("batch_size", [1, 2])
 @pytest.mark.parametrize("n_src", [1, 2])
-@pytest.mark.parametrize("window", ["hanning", None])
+@pytest.mark.parametrize("window", ["hann", None])
 @pytest.mark.parametrize("window_size", [128])
 @pytest.mark.parametrize("hop_size", [64])
 def test_overlap_add(length, batch_size, n_src, window, window_size, hop_size):