Merge pull request #217 from persephone-tools/update-deps

[MRG] Update dependencies

.travis.yml

@@ -1,12 +1,15 @@
 language: python
+sudo: required
+dist: xenial
 python:
   - "3.5"
   - "3.6"
+  - "3.7"
 before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository -y ppa:mc3man/trusty-media && sudo apt-get update && sudo apt-get install ffmpeg; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update && sudo apt-get install ffmpeg; fi
 install:
   - pip install .
-  - pip install pytest-cov
+  - pip install pytest-cov==2.6.0
   - pip install python-coveralls
   - pip install -r test_requirements.txt
 script:

persephone/model.py

@@ -177,10 +177,7 @@ class Model:
     """
 
     def __init__(self, exp_dir: Union[Path, str], corpus_reader: CorpusReader) -> None:
-        if isinstance(exp_dir, Path):
-            self.exp_dir = str(exp_dir) # type: str
-        else:
-            self.exp_dir = exp_dir # type: str
+        self.exp_dir = str(exp_dir) if isinstance(exp_dir, Path) else exp_dir # type: str
         self.corpus_reader = corpus_reader
         self.log_softmax = None
         self.batch_x = None

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name='persephone',
-      version='0.3.2',
+      version='0.3.3',
       description='A tool for developing automatic phoneme transcription models',
       long_description=open('README.rst', encoding="utf8").read(),
       url='https://github.com/oadams/persephone',
@@ -20,14 +20,14 @@
       install_requires=[
            'GitPython==2.1.8',
            'nltk==3.2.5',
-           'numpy==1.14.5',
+           'numpy>=1.14.5,<2',
            'python-speech-features==0.6',
-           'scipy==1.1.0',
-           'tensorflow==1.10.0',
-           'scikit-learn==0.19.1',
+           'scipy>=1.1.0,<2',
+           'tensorflow>=1.13.1,<2',
+           'scikit-learn==0.21.2',
            'pympi-ling==1.69',
            'pydub==0.20.0',
-           'pint==0.8.1',
+           'pint==0.9',
       ],
       include_package_data = True,
 )

test_requirements.txt

@@ -1,6 +1,6 @@
 tox
-pluggy>0.7
+pluggy<1.0,>=0.12
 pylint>1.8
 pytest>=3.9
-pytest-cov
-mypy>=0.6
+pytest-cov==2.6.1
+mypy>=0.7