Commit 4b6b8855 authored by Denis Arrivault's avatar Denis Arrivault
Browse files

Patches setup.py + upgrade cython

parent 31dd832a
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -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',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment