merge conflicts

Author: seyong92

.travis.yml

@@ -4,9 +4,15 @@ python:
   - "3.7"
   - "3.8"
   - "3.9"
+env:
+  - NUMPY_VERSION=1.16.6
+  - NUMPY_VERSION=1.17.5
+  - NUMPY_VERSION=1.18.5
+  - NUMPY_VERSION=1.19.2
 before_install:
   - pip install poetry
 install:
   - poetry install
+  - pip install -q numpy==$NUMPY_VERSION
 script:
   - pytest

pytsmod/tdpsolatsm.py

@@ -81,7 +81,7 @@ def tdpsola(x, sr, src_f0, tgt_f0=None, alpha=1, beta=None,
         output_length = int(np.ceil(x_chan.size * alpha))
 
         pad = int(np.ceil(sr / 100))
-        x_chan = np.pad(x_chan, (pad, pad))
+        x_chan = np.pad(x_chan, (pad, pad), 'constant')
         y_chan = np.zeros(output_length + 2 * pad)  # output signal
 
         tk = pitch_period[0] + 1  # output pitch mark

pytsmod/wsolatsm.py

@@ -59,7 +59,7 @@ def wsola(x, s, win_type='hann',
     # padding the input audio sequence.
     left_pad = int(win_size // 2 + tolerance)
     right_pad = int(np.ceil(1 / min_fac) * win_size + tolerance)
-    x_padded = np.pad(x, ((0, 0), (left_pad, right_pad)))
+    x_padded = np.pad(x, ((0, 0), (left_pad, right_pad)), 'constant')
 
     aw_pos = aw_pos + tolerance