Merge pull request #98 from r9y9/py38

Enable py38 tests on travis

.travis.yml

@@ -5,8 +5,7 @@ language: python
 python:
   - "3.6"
   - "3.7"
-# turn this on once pytorch provides binaries for py38
-# - "3.8"
+  - "3.8"
 
 notifications:
   email: false
@@ -36,9 +35,9 @@ install:
   - pip install -e ".[test]"
 
 script:
-  # Workaround for bandmat installation issue on python 3.7
+  # Workaround for bandmat installation issue on python >= 3.7
   # see https://github.com/MattShannon/bandmat/issues/10
-  - if [[ "$TRAVIS_PYTHON_VERSION" == "3.7" ]]; then
+  - if [ "$TRAVIS_PYTHON_VERSION" == "3.7" -o "$TRAVIS_PYTHON_VERSION" == "3.8" ]; then
       nosetests --with-coverage --cover-package=nnmnkwii -v -w tests/ -a '!require_local_data,!modspec,!requires_bandmat' --ignore-files=test_autograd.py;
     else
       nosetests --with-coverage --cover-package=nnmnkwii -v -w tests/ -a '!require_local_data,!modspec';

a.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ "$HOGE" == "3.7" -o "$HOGE" == "3.8" ]; then
+    echo "3.x!!"
+else
+    echo "huga"
+fi

docs/changelog.rst

@@ -1,15 +1,12 @@
 Change log
 ==========
 
-v0.0.21 <2020-xx-xx>
---------------------
-- `#95`_: Fixed parameter generation error of MLPG.
-
-
-v0.0.20 <2020-xx-xx>
+v0.0.20 <2020-03-02>
 --------------------
 - `#90`_: Expand available speakers list for CMU Arctic dataset
 - `#91`_: Add support for JVS dataset: a free Japanese multi-speaker voice corpus.
+- `#98`_: Enable python 3.8 tests on travis
+- `#95`_: Fixed parameter generation error of MLPG.
 
 --------------------
 
@@ -193,3 +190,5 @@ v0.0.1 <2017-08-14>
 .. _#88: https://github.com/r9y9/nnmnkwii/pull/88
 .. _#90: https://github.com/r9y9/nnmnkwii/pull/90
 .. _#91: https://github.com/r9y9/nnmnkwii/issues/91
+.. _#95: https://github.com/r9y9/nnmnkwii/issues/95
+.. _#98: https://github.com/r9y9/nnmnkwii/pull/98

setup.py

@@ -129,9 +129,9 @@ def package_files(directory):
     'tqdm',
 ]
 
-# Workaround for python 3.7 and bandmat
+# Workaround for python >= 3.7 and bandmat
 # https://github.com/r9y9/deepvoice3_pytorch/issues/154
-if sys.version_info[:2] != (3, 7):
+if sys.version_info[:2] < (3, 7):
     install_requires.append('bandmat >= 0.7')
 
 setup(
@@ -165,6 +165,8 @@ def package_files(directory):
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "License :: OSI Approved :: MIT License",
         "Topic :: Scientific/Engineering",
         "Topic :: Software Development",

tests/test_baseline.py

@@ -42,7 +42,7 @@ def test_diffvc():
     for windows in _get_windows_set():
         np.random.seed(1234)
         src_mc = np.random.rand(T, static_dim * len(windows))
-        tgt_mc = np.random.rand(T, static_dim * len(windows))
+        tgt_mc = np.random.rand(T, static_dim * len(windows)) + 1
 
         # pseudo parallel data
         XY = np.concatenate((src_mc, tgt_mc), axis=-1)
@@ -73,7 +73,7 @@ def test_gmmmap_swap():
 
     np.random.seed(1234)
     src_mc = np.random.rand(T, static_dim * len(windows))
-    tgt_mc = np.random.rand(T, static_dim * len(windows))
+    tgt_mc = np.random.rand(T, static_dim * len(windows)) + 1
 
     # pseudo parallel data
     XY = np.concatenate((src_mc, tgt_mc), axis=-1)