UP with pip upgrade and debian patches

.gitlab-ci.yml

@@ -22,6 +22,7 @@ before_script:
   - export PYTHONPATH=$PYTHONPATH:$SITE_PACKAGES
   - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y cmake libfftw3-dev
   - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y liblapack-dev python3.5 python3.5-dev python3-pip
+  - pip3 install --upgrade pip
   - pip3 install --target=$SITE_PACKAGES scipy matplotlib nose coverage
 
 # Main build 

setup.py

@@ -66,14 +66,9 @@ import distutils.spawn as ds
 import distutils.dir_util as dd
 
 # Always prefer setuptools over distutils
-try:
-    from setuptools import setup, Extension
-    from setuptools.command.clean import clean
-    from setuptools.command.sdist import sdist
-except ImportError:
-    from distutils.core import setup, Extension
-    from distutils.command.clean import clean
-    from distutils.command.sdist import sdist
+from setuptools import setup, find_packages, Extension
+from distutils.command.clean import clean
+from distutils.command.sdist import sdist
 
 # Test if Cython is installed
 USE_CYTHON = True
@@ -214,7 +209,8 @@ class m_build_ext(build_ext):
 ##########################
 def read(*paths):
     """Build a file path from *paths* and return the contents."""
-    with open(os.path.join(*paths), 'r') as f:
+    from io import open
+    with open(os.path.join(*paths), 'r', encoding='utf-8') as f:
         return f.read()
 
 
@@ -320,11 +316,10 @@ def setup_package():
           long_description=(read('README.rst') + '\n\n' +
                             read('HISTORY.rst') + '\n\n' +
                             read('AUTHORS.rst')),
-          packages=["ltfatpy", "ltfatpy.comp", "ltfatpy.fourier",
-                    "ltfatpy.gabor", "ltfatpy.signals", "ltfatpy.sigproc",
-                    "ltfatpy.tools"],
+          packages=find_packages(),
           package_data={'ltfatpy.signals': ['*.wav'],
-                        'ltfatpy.comp': ['*.pxd']},
+                        'ltfatpy.comp': ['*.pxd'],
+                        'ltfatpy.tests.datasets': ['*.mat']},
           url="https://gitlab.lif.univ-mrs.fr/dev/ltfatpy",
           license='GNU GPL V3',
           author='Denis Arrivault and Florent Jaillet',