Changeset 92c83ccc

Timestamp:

Mar 8, 2013, 3:30:45 PM (12 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:

e6f7a4a

Parents:

98c0f92

Message:

python/: move generator.py to lib, improve README, remove env_ files, update MANIFEST.in

Location:

python

Files:

• MANIFEST.in (modified) (1 diff)
• README (modified) (1 diff)
• env_linux (deleted)
• env_osx (deleted)
• lib/__init__.py (added)
• lib/gen_pyobject.py (moved) (moved from python/gen_pyobject.py)
• lib/generator.py (moved) (moved from python/generator.py)
• setup.py (modified) (1 diff)

python/MANIFEST.in

@@ -1 +1 @@
 include README COPYING VERSION
 include ext/*.h
+include lib/generator.py
+include lib/gen_pyobject.py
 include gen/aubio-generated.h
-include generator.py
-include gen_pyobject.py
-include aubio/*.py
-include demos/*.py
 include tests/run_all_tests
 include tests/*.py
+include demos/*.py

python/README

@@ -13 +13 @@
 You should be able to build the aubio python module out of the box:
 
-    $ ./build_osx
+    $ python setup.py build
 
-This should work on linux based systems as well as recent versions of OS X
-(10.8.x). Let me know if you have issues on your platforms.
+To use the python module without installing it, set PYTHONPATH:
+
+    $ export PYTHONPATH=$PYTHONPATH:$PWD/`ls -rtd build/lib.* | head -1`:$PWD/tests
+
+And LD_LIBRARY_PATH:
+
+    $ export LD_LIBRARY_PATH=$PWD/../build/src
+
+Or on macosx systems:
+
+    $ export DYLD_LIBRARY_PATH=$PWD/../build/src
+
+The you should be able to run the tests:
+
+    $ ./tests/run_all_tests
+
+And to try out the demos:
+
+    $ ./demos/demo_source.wav ~/test.wav
 
 Additional tools

python/setup.py

@@ -29 +29 @@
 
 if not os.path.isdir(output_path):
-    from generator import generate_object_files
+    from lib.generator import generate_object_files
     generated_object_files = generate_object_files(output_path)
     # define include dirs