Skip to content

Commit 5b8f82b

Browse files
authored
Merge pull request #112 from r9y9/dev
Dev
2 parents def4eef + c9304ed commit 5b8f82b

36 files changed

Lines changed: 2994 additions & 547 deletions

.github/workflows/ci.yaml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
3+
4+
name: Python package
5+
6+
on:
7+
push:
8+
branches: [ master ]
9+
pull_request:
10+
branches: [ master ]
11+
12+
jobs:
13+
build:
14+
15+
runs-on: ubuntu-latest
16+
env:
17+
OMP_NUM_THREADS: 1
18+
strategy:
19+
matrix:
20+
python-version: [3.7, 3.8, 3.9]
21+
22+
steps:
23+
- uses: actions/checkout@v2
24+
- name: Set up Python ${{ matrix.python-version }}
25+
uses: actions/setup-python@v1
26+
with:
27+
python-version: ${{ matrix.python-version }}
28+
- name: Install dependencies
29+
run: |
30+
sudo apt-get install libsndfile1-dev
31+
python -m pip install --upgrade pip
32+
pip install torch
33+
pip install -e ".[test]"
34+
- name: Test
35+
run: |
36+
nosetests --with-coverage --cover-package=nnmnkwii -v -w tests/ -a '!require_local_data,!modspec'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ README.rst
22
nnmnkwii/version.py
33
nnmnkwii/paramgen/mlpg_helper.c
44
nnmnkwii/util/_linalg.c
5+
nnmnkwii/paramgen/_bandmat/*.c
56
examples
67
docs/references/generated
78
docs/.doctrees

.travis.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,8 @@ install:
3535
- pip install -e ".[test]"
3636

3737
script:
38-
# Workaround for bandmat installation issue on python >= 3.7
39-
# see https://github.com/MattShannon/bandmat/issues/10
40-
- if [ "$TRAVIS_PYTHON_VERSION" == "3.7" -o "$TRAVIS_PYTHON_VERSION" == "3.8" ]; then
41-
nosetests --with-coverage --cover-package=nnmnkwii -v -w tests/ -a '!require_local_data,!modspec,!requires_bandmat' --ignore-files=test_autograd.py;
42-
else
43-
nosetests --with-coverage --cover-package=nnmnkwii -v -w tests/ -a '!require_local_data,!modspec';
44-
fi
45-
- flake8
38+
- nosetests --with-coverage --cover-package=nnmnkwii -v -w tests/ -a '!require_local_data,!modspec';
39+
# - flake8
4640

4741
after_success:
4842
- codecov

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
include README.md LICENSE.md
2-
recursive-include nnmnkwii COPYING
2+
recursive-include nnmnkwii COPYING License
33
recursive-include nnmnkwii/util/_example_data *.lab *.wav *.npz *.hed
44
recursive-include nnmnkwii *.c

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
[![][docs-stable-img]][docs-stable-url]
55
[![][docs-latest-img]][docs-latest-url]
66
[![PyPI](https://img.shields.io/pypi/v/nnmnkwii.svg)](https://pypi.python.org/pypi/nnmnkwii)
7+
[![Python package](https://github.com/r9y9/nnmnkwii/actions/workflows/ci.yaml/badge.svg)](https://github.com/r9y9/nnmnkwii/actions/workflows/ci.yaml)
78
[![Build Status](https://travis-ci.org/r9y9/nnmnkwii.svg?branch=master)](https://travis-ci.org/r9y9/nnmnkwii)
89
[![Build status](https://ci.appveyor.com/api/projects/status/ch8cmtpw8ic1sd86?svg=true)](https://ci.appveyor.com/project/r9y9/nnmnkwii)
910
[![codecov](https://codecov.io/gh/r9y9/nnmnkwii/branch/master/graph/badge.svg)](https://codecov.io/gh/r9y9/nnmnkwii)
1011
[![DOI](https://zenodo.org/badge/96328821.svg)](https://zenodo.org/badge/latestdoi/96328821)
1112

1213
Library to build speech synthesis systems designed for easy and fast prototyping.
1314

14-
Supported python versions: 2.7 and 3.6.
15-
1615
## Documentation
1716

1817
- [**STABLE**][docs-stable-url] — **most recently tagged version of the documentation.**

docs/changelog.rst

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
Change log
22
==========
33

4-
v0.0.23 <2021-xx-xx>
4+
v0.0.23 <2021-05-15>
55
--------------------
66

7+
- `#112`_: Renamed continuous_dict to numeric_dict to be more precise.
8+
- `#112`_: Bandmat is now a part of nnmnkwii's internal package. This is to avoid instllation failusres on python >=3.6. https://github.com/MattShannon/bandmat/issues/10
9+
- `#112`_: Started testing using github actions (python 3.7, 3.8, 3.9)
10+
- `#112`_: [hts.io]: :func:`nnmnkwii.io.hts.load_question_set` now keeps question names (e.g. "L-Phone_Boin") in dictionary.
11+
- `#112`_: [hts.io]: New functionality :func:`nnmnkwii.io.hts.write_audacity_labels`
12+
- `#112`_: [hts.io]: New functionality :func:`nnmnkwii.io.hts.write_textgrid`
13+
- `#112`_: Renamed np.int to int
14+
- `#112`_: Added pyproject.yaml
15+
716
v0.0.22 <2020-12-25>
817
--------------------
918

@@ -214,4 +223,5 @@ v0.0.1 <2017-08-14>
214223
.. _#101: https://github.com/r9y9/nnmnkwii/pull/101
215224
.. _#105: https://github.com/r9y9/nnmnkwii/pull/105
216225
.. _#108: https://github.com/r9y9/nnmnkwii/pull/108
217-
.. _#109: https://github.com/r9y9/nnmnkwii/pull/109
226+
.. _#109: https://github.com/r9y9/nnmnkwii/pull/109
227+
.. _#112: https://github.com/r9y9/nnmnkwii/pull/112

0 commit comments

Comments
 (0)