Changeset 1167631

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

Files:

• Makefile (modified) (1 diff)
• nose2.cfg (moved) (moved from python/nose2.cfg) (1 diff)
• python/lib/gen_external.py (modified) (6 diffs)
• python/lib/moresetuptools.py (modified) (2 diffs)
• requirements.txt (added)
• setup.py (moved) (moved from python/setup.py) (6 diffs)

Makefile

@@ -29 +29 @@
 
 build_python:
-        cd python && python ./setup.py generate $(ENABLE_DOUBLE) build
+        python ./setup.py generate $(ENABLE_DOUBLE) build
 
+test_python: export LD_LIBRARY_PATH=$(PWD)/build/src
 test_python:
-        cd python && pip install -v .
-        cd python && LD_LIBRARY_PATH=$(PWD)/build/src nose2 --verbose
-        cd python && pip uninstall -y -v aubio
+        pip install -v -r requirements.txt
+        pip install -v .
+        nose2 --verbose
+        pip uninstall -y -v aubio
 
 test_python_osx:
-        cd python && pip install --user -v .
+        # create links from ~/lib/lib* to build/src/lib*
         [ -f build/src/libaubio.[0-9].dylib ] && ( mkdir -p ~/lib && cp -prv build/src/libaubio.4.dylib ~/lib ) || true
-        cd python && nose2 --verbose
-        cd python && pip uninstall -y -v aubio
+        # then run the tests
+        pip install --user -v -r requirements.txt
+        pip install --user -v .
+        nose2 --verbose
+        pip uninstall -y -v aubio
 
 clean_python:
-        cd python && ./setup.py clean
+        ./setup.py clean
 
 build_python3:
-        cd python && python3 ./setup.py generate $(ENABLE_DOUBLE) build
+        python3 ./setup.py generate $(ENABLE_DOUBLE) build
 
 clean_python3:
-        cd python && python3 ./setup.py clean
+        python3 ./setup.py clean
 
 clean:

nose2.cfg

@@ -1 +1 @@
 [unittest]
-start-dir = tests/
+start-dir = python/tests/
 plugins = nose2.plugins.mp
 

python/lib/gen_external.py

@@ -1 +1 @@
 import os, glob
 
-header = """// this file is generated! do not modify
+header = 'src/aubio.h'
+output_path = 'python/gen'
+
+source_header = """// this file is generated! do not modify
 #include "aubio-types.h"
 """
@@ -42 +45 @@
 
 
-def get_cpp_objects():
+def get_cpp_objects(header=header):
 
-    cpp_output = [l.strip() for l in os.popen('cpp -DAUBIO_UNSTABLE=1 -I../build/src ../src/aubio.h').readlines()]
+    cpp_output = [l.strip() for l in os.popen('cpp -DAUBIO_UNSTABLE=1 {:s}'.format(header)).readlines()]
     #cpp_output = [l.strip() for l in os.popen('cpp -DAUBIO_UNSTABLE=0 -I../build/src ../src/onset/onset.h').readlines()]
     #cpp_output = [l.strip() for l in os.popen('cpp -DAUBIO_UNSTABLE=0 -I../build/src ../src/pitch/pitch.h').readlines()]
@@ -67 +70 @@
     return cpp_output, cpp_objects
 
-def generate_external(output_path, usedouble = False, overwrite = True):
+def generate_external(header=header, output_path=output_path, usedouble=False, overwrite=True):
     if not os.path.isdir(output_path): os.mkdir(output_path)
     elif overwrite == False: return glob.glob(os.path.join(output_path, '*.c'))
     sources_list = []
-    cpp_output, cpp_objects = get_cpp_objects()
+    cpp_output, cpp_objects = get_cpp_objects(header)
     lib = {}
 
@@ -122 +125 @@
     """
 
-    from .gen_code import MappedObject
+    try:
+        from .gen_code import MappedObject
+    except (SystemError, ValueError) as e:
+        from gen_code import MappedObject
     for o in lib:
-        out = header
+        out = source_header
         mapped = MappedObject(lib[o], usedouble = usedouble)
         out += mapped.gen_code()
@@ -133 +139 @@
             sources_list.append(output_file)
 
-    out = header
+    out = source_header
     out += "#include \"aubio-generated.h\""
     check_types = "\n     ||  ".join(["PyType_Ready(&Py_%sType) < 0" % o for o in lib])
@@ -187 +193 @@
 
 if __name__ == '__main__':
-    output_path = 'gen'
-    generate_external(output_path)
+    import sys
+    if len(sys.argv) > 1: header = sys.argv[1]
+    if len(sys.argv) > 2: output_path = sys.argv[2]
+    generate_external(header, output_path)

python/lib/moresetuptools.py

@@ -1 +1 @@
 import distutils, distutils.command.clean, distutils.dir_util
+from .gen_external import generate_external, header, output_path
 
 class CleanGenerated(distutils.command.clean.clean):
     def run(self):
-        distutils.dir_util.remove_tree('gen')
+        distutils.dir_util.remove_tree(output_path)
         distutils.command.clean.clean.run(self)
 
@@ -24 +25 @@
     def run(self):
         self.announce( 'Generating code', level=distutils.log.INFO)
-        from .gen_external import generate_external
-        generated_object_files = generate_external('gen', usedouble = self.enable_double)
+        generated_object_files = generate_external(header, output_path, usedouble = self.enable_double)

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',
     )