Merge branch 'short_seq'

.gitignore

@@ -1,5 +1,5 @@
 # Created by .ignore support plugin (hsz.mobi)
-/tfglib/test.py
+/unused_stuff/
 
 ### JetBrains template
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
@@ -243,4 +243,3 @@ nytprof.out
 *.o
 *.bs
 /_eumm/
-/unused_stuff/

setup.py

@@ -8,29 +8,25 @@
 # Always prefer setuptools over distutils
 from codecs import open
 from os import path
-from sys import version_info
 
 from setuptools import setup
 
 here = path.abspath(path.dirname(__file__))
 
 # Get the long description from the README file
 with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
-    long_description = f.read()
+  long_description = f.read()
 
-# Check if running version is 3.5 or later. If not, we need the scandir package
-if version_info.major == 3 and version_info.minor >= 5:
-    install_requires = ['h5py', 'numpy', 'matplotlib', 'keras'],
-else:
-    install_requires = ['h5py', 'numpy', 'matplotlib', 'keras', 'scandir'],
+install_requires = ['h5py', 'numpy', 'matplotlib', 'keras',
+                    'scandir;python_version<"3.5"'],
 
 setup(
     name='tfglib',
 
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='1.3.1',
+    version='2.0.0',
 
     description='Python libraries for the Voice Conversion TFG',
     long_description=long_description,
@@ -47,28 +43,30 @@
 
     # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
     classifiers=[
-        # How mature is this project? Common values are
-        #   3 - Alpha
-        #   4 - Beta
-        #   5 - Production/Stable
-        'Development Status :: 4 - Beta',
-
-        # Indicate who your project is intended for
-        'Intended Audience :: Developers',
-        'Topic :: Software Development :: Build Tools',
-
-        # Pick your license as you wish (should match "license" above)
-        'License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+)'
-
-        # Specify the Python versions you support here. In particular, ensure
-        # that you indicate whether you support Python 2, Python 3 or both.
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-    ],
+      # How mature is this project? Common values are
+      #   3 - Alpha
+      #   4 - Beta
+      #   5 - Production/Stable
+      'Development Status :: 4 - Beta',
+
+      # Indicate who your project is intended for
+      'Intended Audience :: Developers',
+      'Topic :: Software Development :: Build Tools',
+
+      # Pick your license as you wish (should match "license" above)
+      'License :: OSI Approved :: GNU Lesser General Public License v3 or '
+      'later (LGPLv3+)'
+
+      # Specify the Python versions you support here. In particular, ensure
+      # that you indicate whether you support Python 2, Python 3 or both.
+      'Programming Language :: Python :: 2',
+      'Programming Language :: Python :: 2.7',
+      'Programming Language :: Python :: 3',
+      'Programming Language :: Python :: 3.3',
+      'Programming Language :: Python :: 3.4',
+      'Programming Language :: Python :: 3.5',
+      'Programming Language :: Python :: 3.6',
+      ],
 
     # What does your project relate to?
     keywords='voiceconversion deeplearning development',
@@ -100,12 +98,13 @@
     # installed, specify them here.  If using Python 2.6 or less, then these
     # have to be included in MANIFEST.in as well.
     package_data={
-        'tfglib': ['do_columns.pl'],
-    },
+      'tfglib': ['do_columns.pl'],
+      },
 
     # Although 'package_data' is the preferred approach, in some case you may
     # need to place data files outside of your packages. See:
-    # http://docs.python.org/3.4/distutils/setupscript.html#installing-additional-files # noqa
+    # http://docs.python.org/3.4/distutils/setupscript.html#installing
+    # -additional-files # noqa
     # In this case, 'data_file' will be installed into '<sys.prefix>/my_data'
     # data_files=[('my_data', ['data/data_file'])],
 
@@ -117,4 +116,4 @@
     # 'sample=sample:main',
     # ],
     # },
-)
+    )