History

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

Paul Brossier committed 13 years ago

Commit 92c83cc1 parent 98c0f928 files · +24 −16Browse files

Showing the changes to python (8 of 8 files). Show all

Unified · Split

8 files
  1. python/MANIFEST.in +3 −4
  2. python/README +20 −3
  3. python/env_linux +0 −4
  4. python/env_osx +0 −4
  5. python/lib/__init__.py +0 −0
  6. python/lib/gen_pyobject.py +0 −0
  7. python/lib/generator.py +0 −0
  8. python/setup.py +1 −1
python/MANIFEST.in+3−4
@@ -1,9 +1,8 @@
11 include README COPYING VERSION
22 include ext/*.h
3+include lib/generator.py
4+include lib/gen_pyobject.py
35 include gen/aubio-generated.h
4−include generator.py
5−include gen_pyobject.py
6−include aubio/*.py
7−include demos/*.py
86 include tests/run_all_tests
97 include tests/*.py
8+include demos/*.py
python/README+20−3
@@ -12,10 +12,27 @@ Compiling python aubio · 11 unmodified lines
1212
1313 You should be able to build the aubio python module out of the box:
1414
15− $ ./build_osx
15+ $ python setup.py build
1616
17−This should work on linux based systems as well as recent versions of OS X
18−(10.8.x). Let me know if you have issues on your platforms.
17+To use the python module without installing it, set PYTHONPATH:
18+
19+ $ export PYTHONPATH=$PYTHONPATH:$PWD/`ls -rtd build/lib.* | head -1`:$PWD/tests
20+
21+And LD_LIBRARY_PATH:
22+
23+ $ export LD_LIBRARY_PATH=$PWD/../build/src
24+
25+Or on macosx systems:
26+
27+ $ export DYLD_LIBRARY_PATH=$PWD/../build/src
28+
29+The you should be able to run the tests:
30+
31+ $ ./tests/run_all_tests
32+
33+And to try out the demos:
34+
35+ $ ./demos/demo_source.wav ~/test.wav
1936
2037 Additional tools
2138 ----------------
python/env_linux+0−4
@@ -1,4 +0,0 @@
1−#! /bin/sh
2−
3−export PYTHONPATH=$PWD/`ls -rtd build/lib.* | head -1`:$PWD/tests:$PYTHONPATH
4−export LD_LIBRARY_PATH=$PWD/../build/src
python/env_osx+0−4
@@ -1,4 +0,0 @@
1−#! /bin/sh
2−
3−export PYTHONPATH=$PWD/`ls -rtd build/lib.* | head -1`:$PWD/tests:$PYTHONPATH
4−export DYLD_LIBRARY_PATH=$PWD/../build/src
python/lib/__init__.py+0−0

Empty file added.

python/lib/gen_pyobject.pyrenamed from python/gen_pyobject.py+0−0

File renamed without changes.

python/lib/generator.pyrenamed from python/generator.py+0−0

File renamed without changes.

python/setup.py+1−1
@@ -28,7 +28,7 @@ output_path = 'gen' · 27 unmodified lines
2828 generated_object_files = []
2929
3030 if not os.path.isdir(output_path):
31− from generator import generate_object_files
31+ from lib.generator import generate_object_files
3232 generated_object_files = generate_object_files(output_path)
3333 # define include dirs
3434 else:

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t