Changeset 1167631 for setup.py

Timestamp:

May 13, 2016, 6:50:20 PM (9 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

2e324f5

Parents:

c09efca

Message:

move python/setup.py to setup.py, update Makefile, add requirements

File:

• setup.py (moved) (moved from python/setup.py) (6 diffs)

setup.py

@@ -1 +1 @@
 #! /usr/bin/env python
-
-from setuptools import setup, Extension
-from lib.moresetuptools import CleanGenerated, GenerateCommand
 
 import sys
 import os.path
 import numpy
+from setuptools import setup, Extension
+from python.lib.moresetuptools import CleanGenerated, GenerateCommand
+# function to generate gen/*.{c,h}
+from python.lib.gen_external import generate_external, header, output_path
 
 # read from VERSION
@@ -14 +15 @@
         + AUBIO_VERSION_STATUS
 
-# function to generate gen/*.{c,h}
-from lib.gen_external import generate_external
-output_path = 'gen'
-
 include_dirs = []
 library_dirs = []
@@ -23 +20 @@
 extra_link_args = []
 
-include_dirs += [ 'ext' ]
+include_dirs += [ 'python/ext' ]
 include_dirs += [ output_path ] # aubio-generated.h
 include_dirs += [ numpy.get_include() ]
@@ -30 +27 @@
     extra_link_args += ['-framework','CoreFoundation', '-framework','AudioToolbox']
 
-if os.path.isfile('../src/aubio.h'):
+if os.path.isfile('src/aubio.h'):
     define_macros += [('USE_LOCAL_AUBIO', 1)]
-    include_dirs += ['../src'] # aubio.h
-    library_dirs += ['../build/src']
+    include_dirs += ['src'] # aubio.h
+    library_dirs += ['build/src']
 
 aubio_extension = Extension("aubio._aubio", [
-    "ext/aubiomodule.c",
-    "ext/aubioproxy.c",
-    "ext/ufuncs.c",
-    "ext/py-musicutils.c",
-    "ext/py-cvec.c",
-    # example without macro
-    "ext/py-filter.c",
-    # macroised
-    "ext/py-filterbank.c",
-    "ext/py-fft.c",
-    "ext/py-phasevoc.c",
-    "ext/py-source.c",
-    "ext/py-sink.c",
+    "python/ext/aubiomodule.c",
+    "python/ext/aubioproxy.c",
+    "python/ext/ufuncs.c",
+    "python/ext/py-musicutils.c",
+    "python/ext/py-cvec.c",
+    "python/ext/py-filter.c",
+    "python/ext/py-filterbank.c",
+    "python/ext/py-fft.c",
+    "python/ext/py-phasevoc.c",
+    "python/ext/py-source.c",
+    "python/ext/py-sink.c",
     # generate files if they don't exit
-    ] + generate_external(output_path, overwrite = False),
+    ] + generate_external(header, output_path, overwrite = False),
     include_dirs = include_dirs,
     library_dirs = library_dirs,
@@ -75 +70 @@
     version = __version__,
     packages = ['aubio'],
-    package_dir = {'aubio':'lib/aubio'},
-    scripts = ['scripts/aubiocut'],
+    package_dir = {'aubio':'python/lib/aubio'},
+    scripts = ['python/scripts/aubiocut'],
     ext_modules = [aubio_extension],
     description = 'interface to the aubio library',
@@ -92 +87 @@
         'clean': CleanGenerated,
         'generate': GenerateCommand,
-        }
+        },
+    test_suite = 'nose2.collector.collector',
     )