Changeset f50dea4

Timestamp:

Apr 19, 2016, 1:40:39 AM (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:

5652a8c

Parents:

81ad577 (diff), e89310a0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' of github.com:aubio/aubio into develop

Files:

• .travis.yml (modified) (2 diffs)
• Makefile (modified) (1 diff)
• python/lib/aubio/midiconv.py (modified) (2 diffs)
• python/lib/gen_code.py (added)
• python/lib/gen_external.py (added)
• python/lib/gen_pyobject.py (deleted)
• python/lib/generator.py (deleted)
• python/setup.py (modified) (1 diff)
• python/tests/test_note2midi.py (modified) (2 diffs)
• python/tests/test_sink.py (modified) (3 diffs)
• python/tests/test_source.py (modified) (2 diffs)

.travis.yml

@@ -22 +22 @@
     - python-dev
     - python-numpy
+    - python3-setuptools
+    - python3-dev
+    - python3-numpy
 
 script:
@@ -27 +30 @@
   - make build_python
   - make clean_python
+  - make build_python3
+  - make clean_python3
   - make clean
   - make distcheck

Makefile

@@ -26 +26 @@
         cd python && ./setup.py clean
 
+build_python3:
+        cd python && python3 ./setup.py build
+
+clean_python3:
+        cd python && python3 ./setup.py clean
+
 clean:
         $(WAFCMD) clean

python/lib/aubio/midiconv.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
+
+import sys
+PY3 = sys.version_info[0] == 3
+if PY3:
+    string_types = [str]
+else:
+    string_types = [str, unicode]
 
 def note2midi(note):
@@ -6 +13 @@
     _valid_modifiers = {None: 0, u'♮': 0, '#': +1, u'♯': +1, u'\udd2a': +2, 'b': -1, u'♭': -1, u'\ufffd': -2}
     _valid_octaves = range(-1, 10)
-    if type(note) not in (str, unicode):
-        raise TypeError("a string is required, got %s" % note)
+    if type(note) not in string_types:
+        raise TypeError("a string is required, got %s (%s)" % (note, str(type(note)) ))
     if not (1 < len(note) < 5):
         raise ValueError(

python/setup.py

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

python/tests/test_note2midi.py

@@ -1 +1 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
 
 from aubio import note2midi, freq2note
@@ -15 +17 @@
         ( 'A#4', 70 ),
         ( 'Bb4', 70 ),
-        ( u'B♭4', 70 ),
+        ( 'B♭4', 70 ),
         ( 'G8', 115 ),
-        ( u'G♯8', 116 ),
+        ( 'G♯8', 116 ),
         ( 'G9', 127 ),
-        ( u'G\udd2a2', 45 ),
-        ( u'B\ufffd2', 45 ),
-        ( u'A♮2', 45 ),
+        ( 'G\udd2a2', 45 ),
+        ( 'B\ufffd2', 45 ),
+        ( 'A♮2', 45 ),
         )
 

python/tests/test_sink.py

@@ -30 +30 @@
         shutil.rmtree(tmpdir)
 
-    def test_many_sinks_not_closed(self):
-        from tempfile import mkdtemp
-        import os.path
-        import shutil
-        tmpdir = mkdtemp()
-        sink_list = []
-        try:
-            for i in range(many_files):
-                path = os.path.join(tmpdir, 'f-' + str(i) + '.wav')
-                g = sink(path, 0)
-                sink_list.append(g)
-                write = 256
-                for n in range(200):
-                    vec = fvec(write)
-                    g(vec, write)
-        except Exception:
-            pass
-        else:
-            self.fail("does not fail on too many files open")
-        for g in sink_list:
-            g.close()
-        shutil.rmtree(tmpdir)
-
     def test_read_and_write(self):
 
@@ -70 +47 @@
                     total_frames += read
                     if read < f.hop_size: break
-                if 0:
-                    print ("read", "%.2fs" % (total_frames / float(f.samplerate) ) ),
-                    print ("(", total_frames, "frames", "in" ),
-                    print (total_frames / f.hop_size, "blocks", "at", "%dHz" % f.samplerate, ")" ),
-                    print ("from", f.uri ),
-                    print ("to", g.uri)
                 del_tmp_sink_path(sink_path)
 
@@ -95 +66 @@
                     total_frames += read
                     if read < f.hop_size: break
-                if 0:
-                    print ("read", "%.2fs" % (total_frames / float(f.samplerate) ) ),
-                    print ("(", total_frames, "frames", "in" ),
-                    print (f.channels, "channels", "in" ),
-                    print (total_frames / f.hop_size, "blocks", "at", "%dHz" % f.samplerate, ")" ),
-                    print ("from", f.uri ),
-                    print ("to", g.uri ),
-                    print ("in", g.channels, "channels")
                 del_tmp_sink_path(sink_path)
 

python/tests/test_source.py

@@ -39 +39 @@
             total_frames += read
             if read < f.hop_size: break
-        print ("read", "%.2fs" % (total_frames / float(f.samplerate) ) ),
-        print ("(", total_frames, "frames", "in" ),
-        print (total_frames / f.hop_size, "blocks", "at", "%dHz" % f.samplerate, ")" ),
-        print ("from", f.uri)
+        result_str = "read {:.2f}s ({:d} frames in {:d} blocks at {:d}Hz) from {:s}"
+        params = total_frames / float(f.samplerate), total_frames, int(total_frames/f.hop_size), f.samplerate, f.uri
+        print (result_str.format(*params))
         return total_frames
 
@@ -109 +108 @@
             total_frames += read
             if read < f.hop_size: break
-        print ("read", "%.2fs" % (total_frames / float(f.samplerate) ) ),
-        print ("(", total_frames, "frames", "in" ),
-        print (f.channels, "channels and" ),
-        print (total_frames / f.hop_size, "blocks", "at", "%dHz" % f.samplerate, ")" ),
-        print ("from", f.uri)
+        result_str = "read {:.2f}s ({:d} frames in {:d} channels and {:d} blocks at {:d}Hz) from {:s}"
+        params = total_frames / float(f.samplerate), total_frames, f.channels, int(total_frames/f.hop_size), f.samplerate, f.uri
+        print (result_str.format(*params))
         return total_frames