Merge pull request #127 from decfrr/decfrr/fix-numpy-version

Fixed the problem that caused installation to fail.

.github/workflows/ci.yaml

@@ -18,8 +18,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-latest
-            python-version: 3.7
           - os: ubuntu-latest
             python-version: 3.8
           - os: ubuntu-latest
@@ -37,7 +35,7 @@ jobs:
       with:
         submodules: true
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install OS dependencies

nnmnkwii/preprocessing/alignment.py

@@ -130,7 +130,7 @@ def transform(self, XY):
         Xc = X.copy()  # this will be updated iteratively
         X_aligned = np.zeros_like(longer_features)
         Y_aligned = np.zeros_like(longer_features)
-        refined_paths = np.empty(len(X), dtype=np.object)
+        refined_paths = np.empty(len(X), dtype=object)
 
         for idx in range(self.n_iter):
             for idx, (x, y) in enumerate(zip(Xc, Y)):

pyproject.toml

@@ -3,7 +3,7 @@ requires = [
     "wheel",
     "setuptools",
     "cython>=0.21.0",
-    "numpy>=v1.20.0",
+    "numpy>=v1.20.0, <2",
     "scipy",
 ]
 

setup.py

@@ -141,6 +141,7 @@ def package_files(directory):
     "scikit-learn",
     "pysptk >= 0.1.17",
     "tqdm",
+    "numpy >= 1.20.0, <2",
 ]
 
 setup(
@@ -157,7 +158,6 @@ def package_files(directory):
     package_data={"": package_data},
     ext_modules=ext_modules,
     cmdclass=cmdclass,
-    setup_requires=["numpy >= 1.20.0"],
     install_requires=install_requires,
     tests_require=["nose", "coverage"],
     extras_require={

tests/test_datasets.py

@@ -72,7 +72,7 @@ def __test_wrong_num_collected_files():
         X[0]
 
     yield raises(TypeError)(__test_wrong_num_args)
-    yield raises(RuntimeError)(__test_wrong_num_collected_files)
+    yield raises(ValueError)(__test_wrong_num_collected_files)
 
 
 @attr("pickle")

tests/test_pack_pad_sequence.py

@@ -108,7 +108,7 @@ def test_pack_sequnce():
 
     dataset = PyTorchDataset(X, Y, lengths)
     loader = data_utils.DataLoader(
-        dataset, batch_size=batch_size, num_workers=1, shuffle=True
+        dataset, batch_size=batch_size, num_workers=0, shuffle=True
     )
 
     # Test if trining loop pass with no errors. The following code was adapted

tests/test_preprocessing.py

@@ -124,7 +124,7 @@ def test_mulaw_real():
     mu = 256
     y = P.mulaw_quantize(x, mu)
     assert y.min() >= 0 and y.max() < mu
-    assert y.dtype == np.int
+    assert y.dtype == int
     x = P.inv_mulaw_quantize(y, mu) * 32768
     assert x.dtype == np.float32
     x = x.astype(np.int16)
@@ -460,7 +460,7 @@ def test_dtw_aligner():
     fs, x = wavfile.read(example_audio_file())
     x = (x / 32768.0).astype(np.float32)
     assert fs == 16000
-    x_fast = librosa.effects.time_stretch(x, 2.0)
+    x_fast = librosa.effects.time_stretch(x, rate=2.0)
 
     X = _get_mcep(x, fs)
     Y = _get_mcep(x_fast, fs)