Merge branch 'feature/pitchshift' into feature/timestretch

Paul Brossier committed 7 years ago

Commit cb0d7d02 parents 6e157df d0f19a7101 files · +1797 −1448Browse files

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

Unified · Split

41 files

python/README.md +1 −1
python/ext/aubio-docstrings.h +143 −0
python/ext/aubio-types.h +1 −0
python/ext/aubiomodule.c +2 −2
python/ext/py-cvec.c +1 −1
python/ext/py-fft.c +19 −1
python/ext/py-filter.c +55 −4
python/ext/py-filterbank.c +209 −9
python/ext/py-musicutils.c +10 −10
python/lib/gen_code.py +13 −3
python/tests/__init__.py +0 −1
python/tests/_tools.py +41 −0
python/tests/run_all_tests +0 −5
python/tests/test_aubio.py +1 −2
python/tests/test_aubio_cmd.py +2 −2
python/tests/test_aubio_cut.py +1 −1
python/tests/test_cvec.py +1 −1
python/tests/test_dct.py +4 −0
python/tests/test_fft.py +1 −1
python/tests/test_filter.py +2 −2
python/tests/test_filterbank.py +3 −3
python/tests/test_filterbank_mel.py +14 −15
python/tests/test_fvec.py +1 −1
python/tests/test_fvec_shift.py +1 −1
python/tests/test_hztomel.py +11 −8
python/tests/test_mathutils.py +1 −1
python/tests/test_mfcc.py +17 −21
python/tests/test_midi2note.py +11 −12
python/tests/test_musicutils.py +2 −2
python/tests/test_note2midi.py +24 −19
python/tests/test_notes.py +6 −7
python/tests/test_onset.py +1 −1
python/tests/test_phasevoc.py +13 −8
python/tests/test_pitch.py +5 −5
python/tests/test_sink.py +16 −22
python/tests/test_slicing.py +3 −3
python/tests/test_source.py +56 −53
python/tests/test_source_channels.py +1 −1
python/tests/test_specdesc.py +1 −1
python/tests/test_zero_crossing_rate.py +1 −1
python/tests/utils.py +6 −12

@@ -27,7 +27,7 @@ Links · 26 unmodified lines
27	27	Demos
28	28	-----
29	29
30		−Some examples are available in the [`python/demos`][demos_dir] folder. Each
	30	+Some examples are available in the [`python/demos` folder][demos_dir]. Each
31	31	script is a command line program which accepts one ore more argument.
32	32
33	33	Notes: installing additional modules is required to run some of the demos.

python/ext/aubio-docstrings.h+143−0

@@ -0,0 +1,143 @@
	1	+#define PYAUBIO_dct_doc \
	2	+ "dct(size=1024)\n"\
	3	+ "\n"\
	4	+ "Compute Discrete Fourier Transorms of Type-II.\n"\
	5	+ "\n"\
	6	+ "Parameters\n"\
	7	+ "----------\n"\
	8	+ "size : int\n"\
	9	+ " size of the DCT to compute\n"\
	10	+ "\n"\
	11	+ "Example\n"\
	12	+ "-------\n"\
	13	+ ">>> d = aubio.dct(16)\n"\
	14	+ ">>> d.size\n"\
	15	+ "16\n"\
	16	+ ">>> x = aubio.fvec(np.ones(d.size))\n"\
	17	+ ">>> d(x)\n"\
	18	+ "array([4., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.],\n"\
	19	+ " dtype=float32)\n"\
	20	+ ">>> d.rdo(d(x))\n"\
	21	+ "array([1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.],\n"\
	22	+ " dtype=float32)\n"\
	23	+ "\n"\
	24	+ "References\n"\
	25	+ "----------\n"\
	26	+ "`DCT-II in Discrete Cosine Transform\n"\
	27	+ "<https://en.wikipedia.org/wiki/Discrete_cosine_transform#DCT-II>`_\n"\
	28	+ "on Wikipedia.\n"
	29	+
	30	+#define PYAUBIO_mfcc_doc \
	31	+ "mfcc(buf_size=1024, n_filters=40, n_coeffs=13, samplerate=44100)\n"\
	32	+ "\n"\
	33	+ "Compute Mel Frequency Cepstrum Coefficients (MFCC).\n"\
	34	+ "\n"\
	35	+ "`mfcc` creates a callable which takes a `cvec` as input.\n"\
	36	+ "\n"\
	37	+ "If `n_filters = 40`, the filterbank will be initialized with\n"\
	38	+ ":meth:`filterbank.set_mel_coeffs_slaney`. Otherwise, if `n_filters`\n"\
	39	+ "is greater than `0`, it will be initialized with\n"\
	40	+ ":meth:`filterbank.set_mel_coeffs` using `fmin = 0`,\n"\
	41	+ "`fmax = samplerate/`.\n"\
	42	+ "\n"\
	43	+ "Example\n"\
	44	+ "-------\n"\
	45	+ ">>> buf_size = 2048; n_filters = 128; n_coeffs = 13; samplerate = 44100\n"\
	46	+ ">>> mf = aubio.mfcc(buf_size, n_filters, n_coeffs, samplerate)\n"\
	47	+ ">>> fftgrain = aubio.cvec(buf_size)\n"\
	48	+ ">>> mf(fftgrain).shape\n"\
	49	+ "(13,)\n"\
	50	+ ""
	51	+
	52	+#define PYAUBIO_notes_doc \
	53	+ "notes(method=\"default\", buf_size=1024, hop_size=512, samplerate=44100)\n"\
	54	+ "\n"\
	55	+ "Note detection\n"
	56	+
	57	+#define PYAUBIO_onset_doc \
	58	+ "onset(method=\"default\", buf_size=1024, hop_size=512, samplerate=44100)\n"\
	59	+ "\n"\
	60	+ "Onset detection object. `method` should be one of method supported by\n"\
	61	+ ":class:`specdesc`.\n"
	62	+
	63	+#define PYAUBIO_pitch_doc \
	64	+ "pitch(method=\"default\", buf_size=1024, hop_size=512, samplerate=44100)\n"\
	65	+ "\n"\
	66	+ "Pitch detection.\n"\
	67	+ "\n"\
	68	+ "Supported methods: `yinfft`, `yin`, `yinfast`, `fcomb`, `mcomb`,\n"\
	69	+ "`schmitt`, `specacf`, `default` (`yinfft`).\n"
	70	+
	71	+#define PYAUBIO_sampler_doc \
	72	+ "sampler(hop_size=512, samplerate=44100)\n"\
	73	+ "\n"\
	74	+ "Sampler.\n"
	75	+
	76	+#define PYAUBIO_specdesc_doc \
	77	+ "specdesc(method=\"default\", buf_size=1024)\n"\
	78	+ "\n"\
	79	+ "Spectral description functions. Creates a callable that takes a\n"\
	80	+ ":class:`cvec` as input, typically created by :class:`pvoc` for\n"\
	81	+ "overlap and windowing, and returns a single float.\n"\
	82	+ "\n"\
	83	+ "`method` can be any of the values listed below. If `default` is used\n"\
	84	+ "the `hfc` function will be selected.\n"\
	85	+ "\n"\
	86	+ "Onset novelty functions:\n"\
	87	+ "\n"\
	88	+ "- `energy`: local energy,\n"\
	89	+ "- `hfc`: high frequency content,\n"\
	90	+ "- `complex`: complex domain,\n"\
	91	+ "- `phase`: phase-based method,\n"\
	92	+ "- `wphase`: weighted phase deviation,\n"\
	93	+ "- `specdiff`: spectral difference,\n"\
	94	+ "- `kl`: Kullback-Liebler,\n"\
	95	+ "- `mkl`: modified Kullback-Liebler,\n"\
	96	+ "- `specflux`: spectral flux.\n"\
	97	+ "\n"\
	98	+ "Spectral shape functions:\n"\
	99	+ "\n"\
	100	+ "- `centroid`: spectral centroid (barycenter of the norm vector),\n"\
	101	+ "- `spread`: variance around centroid,\n"\
	102	+ "- `skewness`: third order moment,\n"\
	103	+ "- `kurtosis`: a measure of the flatness of the spectrum,\n"\
	104	+ "- `slope`: decreasing rate of the amplitude,\n"\
	105	+ "- `decrease`: perceptual based measurement of the decreasing rate,\n"\
	106	+ "- `rolloff`: 95th energy percentile.\n"\
	107	+ "\n"\
	108	+ "Parameters\n"\
	109	+ "----------\n"\
	110	+ "method : str\n"\
	111	+ " Onset novelty or spectral shape function.\n"\
	112	+ "buf_size : int\n"\
	113	+ " Length of the input frame.\n"\
	114	+ "\n"\
	115	+ "Example\n"\
	116	+ "-------\n"\
	117	+ ">>> win_s = 1024; hop_s = win_s // 2\n"\
	118	+ ">>> pv = aubio.pvoc(win_s, hop_s)\n"\
	119	+ ">>> sd = aubio.specdesc(\"mkl\", win_s)\n"\
	120	+ ">>> sd(pv(aubio.fvec(hop_s))).shape\n"\
	121	+ "(1,)\n"\
	122	+ "\n"\
	123	+ "References\n"\
	124	+ "----------\n"\
	125	+ "`Detailed description "\
	126	+ "<https://aubio.org/doc/latest/specdesc_8h.html#details>`_ in\n"\
	127	+ "`aubio API documentation <https://aubio.org/doc/latest/index.html>`_.\n"\
	128	+ ""
	129	+
	130	+#define PYAUBIO_tempo_doc \
	131	+ "tempo(method=\"default\", buf_size=1024, hop_size=512, samplerate=44100)\n"\
	132	+ "\n"\
	133	+ "Tempo detection and beat tracking.\n"
	134	+
	135	+#define PYAUBIO_tss_doc \
	136	+ "tss(buf_size=1024, hop_size=512)\n"\
	137	+ "\n"\
	138	+ "Transient/Steady-state separation.\n"
	139	+
	140	+#define PYAUBIO_wavetable_doc \
	141	+ "wavetable(samplerate=44100, hop_size=512)\n"\
	142	+ "\n"\
	143	+ "Wavetable synthesis.\n"

python/ext/aubio-types.h+1−0

@@ -1,6 +1,7 @@
1	1	#include <Python.h>
2	2	#include <structmember.h>
3	3
	4	+#include "aubio-docstrings.h"
4	5	#include "aubio-generated.h"
5	6
6	7	#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION

python/ext/aubiomodule.c+2−2

@@ -223,7 +223,7 @@ Py_alpha_norm (PyObject * self, PyObject * args) · 222 unmodified lines
223	223	}
224	224
225	225	// compute the function
226		− result = Py_BuildValue (AUBIO_NPY_SMPL_CHR, fvec_alpha_norm (&vec, alpha));
	226	+ result = PyFloat_FromDouble(fvec_alpha_norm (&vec, alpha));
227	227	if (result == NULL) {
228	228	return NULL;
229	229	}
@@ -319,7 +319,7 @@ Py_zero_crossing_rate (PyObject * self, PyObject * args) · 89 unmodified lines
319	319	}
320	320
321	321	// compute the function
322		− result = Py_BuildValue (AUBIO_NPY_SMPL_CHR, aubio_zero_crossing_rate (&vec));
	322	+ result = PyFloat_FromDouble(aubio_zero_crossing_rate (&vec));
323	323	if (result == NULL) {
324	324	return NULL;
325	325	}

python/ext/py-cvec.c+1−1

@@ -136,7 +136,7 @@ Py_cvec_repr (Py_cvec * self, PyObject * unused) · 135 unmodified lines
136	136	goto fail;
137	137	}
138	138
139		− args = Py_BuildValue ("I", self->length);
	139	+ args = PyLong_FromLong(self->length);
140	140	if (args == NULL) {
141	141	goto fail;
142	142	}

python/ext/py-fft.c+19−1

@@ -1,6 +1,24 @@
1	1	#include "aubio-types.h"
2	2
3		−static char Py_fft_doc[] = "fft object";
	3	+static char Py_fft_doc[] = ""
	4	+"fft(size=1024)\n"
	5	+"\n"
	6	+"Compute Fast Fourier Transorms.\n"
	7	+"\n"
	8	+"Parameters\n"
	9	+"----------\n"
	10	+"size : int\n"
	11	+" size of the FFT to compute\n"
	12	+"\n"
	13	+"Example\n"
	14	+"-------\n"
	15	+">>> x = aubio.fvec(512)\n"
	16	+">>> f = aubio.fft(512)\n"
	17	+">>> c = f(x); c\n"
	18	+"aubio cvec of 257 elements\n"
	19	+">>> x2 = f.rdo(c); x2.shape\n"
	20	+"(512,)\n"
	21	+"";
4	22
5	23	typedef struct
6	24	{

python/ext/py-filter.c+55−4

@@ -10,7 +10,58 @@ typedef struct · 9 unmodified lines
10	10	fvec_t c_out;
11	11	} Py_filter;
12	12
13		−static char Py_filter_doc[] = "filter object";
	13	+static char Py_filter_doc[] = ""
	14	+"digital_filter(order=7)\n"
	15	+"\n"
	16	+"Create a digital filter.\n"
	17	+"";
	18	+
	19	+static char Py_filter_set_c_weighting_doc[] = ""
	20	+"set_c_weighting(samplerate)\n"
	21	+"\n"
	22	+"Set filter coefficients to C-weighting.\n"
	23	+"\n"
	24	+"`samplerate` should be one of 8000, 11025, 16000, 22050, 24000, 32000,\n"
	25	+"44100, 48000, 88200, 96000, or 192000. `order` of the filter should be 5.\n"
	26	+"\n"
	27	+"Parameters\n"
	28	+"----------\n"
	29	+"samplerate : int\n"
	30	+" Sampling-rate of the input signal, in Hz.\n"
	31	+"";
	32	+
	33	+static char Py_filter_set_a_weighting_doc[] = ""
	34	+"set_a_weighting(samplerate)\n"
	35	+"\n"
	36	+"Set filter coefficients to A-weighting.\n"
	37	+"\n"
	38	+"`samplerate` should be one of 8000, 11025, 16000, 22050, 24000, 32000,\n"
	39	+"44100, 48000, 88200, 96000, or 192000. `order` of the filter should be 7.\n"
	40	+"\n"
	41	+"Parameters\n"
	42	+"----------\n"
	43	+"samplerate : int\n"
	44	+" Sampling-rate of the input signal.\n"
	45	+"";
	46	+
	47	+static char Py_filter_set_biquad_doc[] = ""
	48	+"set_biquad(b0, b1, b2, a1, a2)\n"
	49	+"\n"
	50	+"Set biquad coefficients. `order` of the filter should be 3.\n"
	51	+"\n"
	52	+"Parameters\n"
	53	+"----------\n"
	54	+"b0 : float\n"
	55	+" Forward filter coefficient.\n"
	56	+"b1 : float\n"
	57	+" Forward filter coefficient.\n"
	58	+"b2 : float\n"
	59	+" Forward filter coefficient.\n"
	60	+"a1 : float\n"
	61	+" Feedback filter coefficient.\n"
	62	+"a2 : float\n"
	63	+" Feedback filter coefficient.\n"
	64	+"";
14	65
15	66	static PyObject *
16	67	Py_filter_new (PyTypeObject * type, PyObject * args, PyObject * kwds)
@@ -156,11 +207,11 @@ static PyMemberDef Py_filter_members[] = { · 139 unmodified lines
156	207
157	208	static PyMethodDef Py_filter_methods[] = {
158	209	{"set_c_weighting", (PyCFunction) Py_filter_set_c_weighting, METH_VARARGS,
159		− "set filter coefficients to C-weighting"},
	210	+ Py_filter_set_c_weighting_doc},
160	211	{"set_a_weighting", (PyCFunction) Py_filter_set_a_weighting, METH_VARARGS,
161		− "set filter coefficients to A-weighting"},
	212	+ Py_filter_set_a_weighting_doc},
162	213	{"set_biquad", (PyCFunction) Py_filter_set_biquad, METH_VARARGS,
163		− "set b0, b1, b2, a1, a2 biquad coefficients"},
	214	+ Py_filter_set_biquad_doc},
164	215	{NULL}
165	216	};
166	217

python/ext/py-filterbank.c+209−9

@@ -1,6 +1,188 @@
1	1	#include "aubio-types.h"
2	2
3		−static char Py_filterbank_doc[] = "filterbank object";
	3	+static char Py_filterbank_doc[] = ""
	4	+"filterbank(n_filters=40, win_s=1024)\n"
	5	+"\n"
	6	+"Create a bank of spectral filters. Each instance is a callable\n"
	7	+"that holds a matrix of coefficients.\n"
	8	+"\n"
	9	+"See also :meth:`set_mel_coeffs`, :meth:`set_mel_coeffs_htk`,\n"
	10	+":meth:`set_mel_coeffs_slaney`, :meth:`set_triangle_bands`, and\n"
	11	+":meth:`set_coeffs`.\n"
	12	+"\n"
	13	+"Parameters\n"
	14	+"----------\n"
	15	+"n_filters : int\n"
	16	+" Number of filters to create.\n"
	17	+"win_s : int\n"
	18	+" Size of the input spectrum to process.\n"
	19	+"\n"
	20	+"Examples\n"
	21	+"--------\n"
	22	+">>> f = aubio.filterbank(128, 1024)\n"
	23	+">>> f.set_mel_coeffs(44100, 0, 10000)\n"
	24	+">>> c = aubio.cvec(1024)\n"
	25	+">>> f(c).shape\n"
	26	+"(128, )\n"
	27	+"";
	28	+
	29	+static char Py_filterbank_set_triangle_bands_doc[] =""
	30	+"set_triangle_bands(freqs, samplerate)\n"
	31	+"\n"
	32	+"Set triangular bands. The coefficients will be set to triangular\n"
	33	+"overlapping windows using the boundaries specified by `freqs`.\n"
	34	+"\n"
	35	+"`freqs` should contain `n_filters + 2` frequencies in Hz, ordered\n"
	36	+"by value, from smallest to largest. The first element should be greater\n"
	37	+"or equal to zero; the last element should be smaller or equal to\n"
	38	+"`samplerate / 2`.\n"
	39	+"\n"
	40	+"Parameters\n"
	41	+"----------\n"
	42	+"freqs: fvec\n"
	43	+" List of frequencies, in Hz.\n"
	44	+"samplerate : float\n"
	45	+" Sampling-rate of the expected input.\n"
	46	+"\n"
	47	+"Example\n"
	48	+"-------\n"
	49	+">>> fb = aubio.filterbank(n_filters=100, win_s=2048)\n"
	50	+">>> samplerate = 44100; freqs = np.linspace(0, 20200, 102)\n"
	51	+">>> fb.set_triangle_bands(aubio.fvec(freqs), samplerate)\n"
	52	+"";
	53	+
	54	+static char Py_filterbank_set_mel_coeffs_slaney_doc[] = ""
	55	+"set_mel_coeffs_slaney(samplerate)\n"
	56	+"\n"
	57	+"Set coefficients of filterbank to match Slaney's Auditory Toolbox.\n"
	58	+"\n"
	59	+"The filter coefficients will be set as in Malcolm Slaney's\n"
	60	+"implementation. The filterbank should have been created with\n"
	61	+"`n_filters = 40`.\n"
	62	+"\n"
	63	+"This is approximately equivalent to using :meth:`set_mel_coeffs` with\n"
	64	+"`fmin = 400./3., fmax = 6853.84`.\n"
	65	+"\n"
	66	+"Parameters\n"
	67	+"----------\n"
	68	+"samplerate : float\n"
	69	+" Sampling-rate of the expected input.\n"
	70	+"\n"
	71	+"References\n"
	72	+"----------\n"
	73	+"\n"
	74	+"Malcolm Slaney, `Auditory Toolbox Version 2, Technical Report #1998-010\n"
	75	+"<https://engineering.purdue.edu/~malcolm/interval/1998-010/>`_\n"
	76	+"";
	77	+
	78	+static char Py_filterbank_set_mel_coeffs_doc[] = ""
	79	+"set_mel_coeffs(samplerate, fmin, fmax)\n"
	80	+"\n"
	81	+"Set coefficients of filterbank to linearly spaced mel scale.\n"
	82	+"\n"
	83	+"Parameters\n"
	84	+"----------\n"
	85	+"samplerate : float\n"
	86	+" Sampling-rate of the expected input.\n"
	87	+"fmin : float\n"
	88	+" Lower frequency boundary of the first filter.\n"
	89	+"fmax : float\n"
	90	+" Upper frequency boundary of the last filter.\n"
	91	+"\n"
	92	+"See also\n"
	93	+"--------\n"
	94	+"hztomel\n"
	95	+"";
	96	+
	97	+static char Py_filterbank_set_mel_coeffs_htk_doc[] = ""
	98	+"set_mel_coeffs_htk(samplerate, fmin, fmax)\n"
	99	+"\n"
	100	+"Set coefficients of the filters to be linearly spaced in the HTK mel scale.\n"
	101	+"\n"
	102	+"Parameters\n"
	103	+"----------\n"
	104	+"samplerate : float\n"
	105	+" Sampling-rate of the expected input.\n"
	106	+"fmin : float\n"
	107	+" Lower frequency boundary of the first filter.\n"
	108	+"fmax : float\n"
	109	+" Upper frequency boundary of the last filter.\n"
	110	+"\n"
	111	+"See also\n"
	112	+"--------\n"
	113	+"hztomel with `htk=True`\n"
	114	+"";
	115	+
	116	+static char Py_filterbank_get_coeffs_doc[] = ""
	117	+"get_coeffs()\n"
	118	+"\n"
	119	+"Get coefficients matrix of filterbank.\n"
	120	+"\n"
	121	+"Returns\n"
	122	+"-------\n"
	123	+"array_like\n"
	124	+" Array of shape (n_filters, win_s/2+1) containing the coefficients.\n"
	125	+"";
	126	+
	127	+static char Py_filterbank_set_coeffs_doc[] = ""
	128	+"set_coeffs(coeffs)\n"
	129	+"\n"
	130	+"Set coefficients of filterbank.\n"
	131	+"\n"
	132	+"Parameters\n"
	133	+"----------\n"
	134	+"coeffs : fmat\n"
	135	+" Array of shape (n_filters, win_s/2+1) containing the coefficients.\n"
	136	+"";
	137	+
	138	+static char Py_filterbank_set_power_doc[] = ""
	139	+"set_power(power)\n"
	140	+"\n"
	141	+"Set power applied to input spectrum of filterbank.\n"
	142	+"\n"
	143	+"Parameters\n"
	144	+"----------\n"
	145	+"power : float\n"
	146	+" Power to raise input spectrum to before computing the filters.\n"
	147	+"";
	148	+
	149	+static char Py_filterbank_get_power_doc[] = ""
	150	+"get_power()\n"
	151	+"\n"
	152	+"Get power applied to filterbank.\n"
	153	+"\n"
	154	+"Returns\n"
	155	+"-------\n"
	156	+"float\n"
	157	+" Power parameter.\n"
	158	+"";
	159	+
	160	+static char Py_filterbank_set_norm_doc[] = ""
	161	+"set_norm(norm)\n"
	162	+"\n"
	163	+"Set norm parameter. If set to `0`, the filters will not be normalized.\n"
	164	+"If set to `1`, the filters will be normalized to one. Default to `1`.\n"
	165	+"\n"
	166	+"This function should be called before :meth:`set_triangle_bands`,\n"
	167	+":meth:`set_mel_coeffs`, :meth:`set_mel_coeffs_htk`, or\n"
	168	+":meth:`set_mel_coeffs_slaney`.\n"
	169	+"\n"
	170	+"Parameters\n"
	171	+"----------\n"
	172	+"norm : int\n"
	173	+" `0` to disable, `1` to enable\n"
	174	+"";
	175	+
	176	+static char Py_filterbank_get_norm_doc[] = ""
	177	+"get_norm()\n"
	178	+"\n"
	179	+"Get norm parameter of filterbank.\n"
	180	+"\n"
	181	+"Returns\n"
	182	+"-------\n"
	183	+"float\n"
	184	+" Norm parameter.\n"
	185	+"";
4	186
5	187	typedef struct
6	188	{
@@ -288,6 +470,13 @@ Py_filterbank_set_power(Py_filterbank self, PyObject args) · 281 unmodified lines
288	470	Py_RETURN_NONE;
289	471	}
290	472
	473	+static PyObject *
	474	+Py_filterbank_get_power (Py_filterbank * self, PyObject *unused)
	475	+{
	476	+ smpl_t power = aubio_filterbank_get_power(self->o);
	477	+ return (PyObject *)PyFloat_FromDouble (power);
	478	+}
	479	+
291	480	static PyObject *
292	481	Py_filterbank_set_norm(Py_filterbank self, PyObject args)
293	482	{
@@ -311,23 +500,34 @@ Py_filterbank_set_norm(Py_filterbank self, PyObject args) · 17 unmodified lines
311	500	Py_RETURN_NONE;
312	501	}
313	502
	503	+static PyObject *
	504	+Py_filterbank_get_norm (Py_filterbank * self, PyObject *unused)
	505	+{
	506	+ smpl_t norm = aubio_filterbank_get_norm(self->o);
	507	+ return (PyObject *)PyFloat_FromDouble (norm);
	508	+}
	509	+
314	510	static PyMethodDef Py_filterbank_methods[] = {
315	511	{"set_triangle_bands", (PyCFunction) Py_filterbank_set_triangle_bands,
316		− METH_VARARGS, "set coefficients of filterbanks"},
	512	+ METH_VARARGS, Py_filterbank_set_triangle_bands_doc},
317	513	{"set_mel_coeffs_slaney", (PyCFunction) Py_filterbank_set_mel_coeffs_slaney,
318		− METH_VARARGS, "set coefficients of filterbank as in Auditory Toolbox"},
	514	+ METH_VARARGS, Py_filterbank_set_mel_coeffs_slaney_doc},
319	515	{"set_mel_coeffs", (PyCFunction) Py_filterbank_set_mel_coeffs,
320		− METH_VARARGS, "set coefficients of filterbank to linearly spaced mel scale"},
	516	+ METH_VARARGS, Py_filterbank_set_mel_coeffs_doc},
321	517	{"set_mel_coeffs_htk", (PyCFunction) Py_filterbank_set_mel_coeffs_htk,
322		− METH_VARARGS, "set coefficients of filterbank to linearly spaced mel scale"},
	518	+ METH_VARARGS, Py_filterbank_set_mel_coeffs_htk_doc},
323	519	{"get_coeffs", (PyCFunction) Py_filterbank_get_coeffs,
324		− METH_NOARGS, "get coefficients of filterbank"},
	520	+ METH_NOARGS, Py_filterbank_get_coeffs_doc},
325	521	{"set_coeffs", (PyCFunction) Py_filterbank_set_coeffs,
326		− METH_VARARGS, "set coefficients of filterbank"},
	522	+ METH_VARARGS, Py_filterbank_set_coeffs_doc},
327	523	{"set_power", (PyCFunction) Py_filterbank_set_power,
328		− METH_VARARGS, "set power applied to filterbank input spectrum"},
	524	+ METH_VARARGS, Py_filterbank_set_power_doc},
	525	+ {"get_power", (PyCFunction) Py_filterbank_get_power,
	526	+ METH_NOARGS, Py_filterbank_get_power_doc},
329	527	{"set_norm", (PyCFunction) Py_filterbank_set_norm,
330		− METH_VARARGS, "set norm applied to filterbank input spectrum"},
	528	+ METH_VARARGS, Py_filterbank_set_norm_doc},
	529	+ {"get_norm", (PyCFunction) Py_filterbank_get_norm,
	530	+ METH_NOARGS, Py_filterbank_get_norm_doc},
331	531	{NULL}
332	532	};
333	533

python/ext/py-musicutils.c+10−10

@@ -39,7 +39,7 @@ Py_aubio_level_lin(PyObject self, PyObject args) · 38 unmodified lines
39	39	return NULL;
40	40	}
41	41
42		− level_lin = Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_level_lin(&vec));
	42	+ level_lin = PyFloat_FromDouble(aubio_level_lin(&vec));
43	43	if (level_lin == NULL) {
44	44	PyErr_SetString (PyExc_ValueError, "failed computing level_lin");
45	45	return NULL;
@@ -67,7 +67,7 @@ Py_aubio_db_spl(PyObject self, PyObject args) · 21 unmodified lines
67	67	return NULL;
68	68	}
69	69
70		− db_spl = Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_db_spl(&vec));
	70	+ db_spl = PyFloat_FromDouble(aubio_db_spl(&vec));
71	71	if (db_spl == NULL) {
72	72	PyErr_SetString (PyExc_ValueError, "failed computing db_spl");
73	73	return NULL;
@@ -96,7 +96,7 @@ Py_aubio_silence_detection(PyObject self, PyObject args) · 22 unmodified lines
96	96	return NULL;
97	97	}
98	98
99		− silence_detection = Py_BuildValue("I", aubio_silence_detection(&vec, threshold));
	99	+ silence_detection = PyLong_FromLong(aubio_silence_detection(&vec, threshold));
100	100	if (silence_detection == NULL) {
101	101	PyErr_SetString (PyExc_ValueError, "failed computing silence_detection");
102	102	return NULL;
@@ -125,7 +125,7 @@ Py_aubio_level_detection(PyObject self, PyObject args) · 22 unmodified lines
125	125	return NULL;
126	126	}
127	127
128		− level_detection = Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_level_detection(&vec, threshold));
	128	+ level_detection = PyFloat_FromDouble(aubio_level_detection(&vec, threshold));
129	129	if (level_detection == NULL) {
130	130	PyErr_SetString (PyExc_ValueError, "failed computing level_detection");
131	131	return NULL;
@@ -194,9 +194,9 @@ Py_aubio_hztomel(PyObject self, PyObject args, PyObject *kwds) · 62 unmodified lines
194	194	return NULL;
195	195	}
196	196	if (htk != NULL && PyObject_IsTrue(htk) == 1)
197		− return Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_hztomel_htk(v));
	197	+ return PyFloat_FromDouble(aubio_hztomel_htk(v));
198	198	else
199		− return Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_hztomel(v));
	199	+ return PyFloat_FromDouble(aubio_hztomel(v));
200	200	}
201	201
202	202	PyObject*
@@ -211,9 +211,9 @@ Py_aubio_meltohz(PyObject self, PyObject args, PyObject *kwds) · 8 unmodified lines
211	211	return NULL;
212	212	}
213	213	if (htk != NULL && PyObject_IsTrue(htk) == 1)
214		− return Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_meltohz_htk(v));
	214	+ return PyFloat_FromDouble(aubio_meltohz_htk(v));
215	215	else
216		− return Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_meltohz(v));
	216	+ return PyFloat_FromDouble(aubio_meltohz(v));
217	217	}
218	218
219	219	PyObject*
@@ -223,7 +223,7 @@ Py_aubio_hztomel_htk(PyObject self, PyObject args) · 3 unmodified lines
223	223	if (!PyArg_ParseTuple(args, AUBIO_NPY_SMPL_CHR, &v)) {
224	224	return NULL;
225	225	}
226		− return Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_hztomel_htk(v));
	226	+ return PyFloat_FromDouble(aubio_hztomel_htk(v));
227	227	}
228	228
229	229	PyObject*
@@ -233,5 +233,5 @@ Py_aubio_meltohz_htk(PyObject self, PyObject args) · 3 unmodified lines
233	233	if (!PyArg_ParseTuple(args, AUBIO_NPY_SMPL_CHR, &v)) {
234	234	return NULL;
235	235	}
236		− return Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_meltohz_htk(v));
	236	+ return PyFloat_FromDouble(aubio_meltohz_htk(v));
237	237	}

python/lib/gen_code.py+13−3

@@ -234,11 +234,21 @@ typedef struct{{ · 233 unmodified lines
234	234	return out.format(do_inputs_list = do_inputs_list, **self.__dict__)
235	235
236	236	def gen_doc(self):
	237	+ sig = []
	238	+ for p in self.input_params:
	239	+ name = p['name']
	240	+ defval = aubiodefvalue[name].replace('"','\\\"')
	241	+ sig.append("{name}={defval}".format(defval=defval, name=name))
237	242	out = """
238		−// TODO: add documentation
239		−static char Py_{shortname}_doc[] = \"undefined\";
	243	+#ifndef PYAUBIO_{shortname}_doc
	244	+#define PYAUBIO_{shortname}_doc "{shortname}({sig})"
	245	+#endif /* PYAUBIO_{shortname}_doc */
	246	+
	247	+static char Py_{shortname}_doc[] = ""
	248	+PYAUBIO_{shortname}_doc
	249	+"";
240	250	"""
241		− return out.format(**self.__dict__)
	251	+ return out.format(sig=', '.join(sig), **self.__dict__)
242	252
243	253	def gen_new(self):
244	254	out = """

python/tests/__init__.py+0−1

@@ -1 +0,0 @@
1		−

python/tests/_tools.py+41−0

@@ -0,0 +1,41 @@
	1	+"""
	2	+This file imports test methods from different testing modules, in this
	3	+order:
	4	+
	5	+ - try importing 'pytest'
	6	+ - if it fails, fallback to 'numpy.testing'
	7	+
	8	+Nose2 support was removed because of lacking assertWarns on py2.7.
	9	+
	10	+"""
	11	+
	12	+import sys
	13	+
	14	+_has_pytest = False
	15	+
	16	+# check if we have pytest
	17	+try:
	18	+ import pytest
	19	+ parametrize = pytest.mark.parametrize
	20	+ assert_raises = pytest.raises
	21	+ assert_warns = pytest.warns
	22	+ skipTest = pytest.skip
	23	+ _has_pytest = True
	24	+ def run_module_suite():
	25	+ import sys, pytest
	26	+ pytest.main(sys.argv)
	27	+except:
	28	+ pass
	29	+
	30	+# otherwise fallback on numpy.testing
	31	+if not _has_pytest:
	32	+ from numpy.testing import dec, assert_raises, assert_warns
	33	+ from numpy.testing import SkipTest
	34	+ parametrize = dec.parametrize
	35	+ def skipTest(msg):
	36	+ raise SkipTest(msg)
	37	+ from numpy.testing import run_module_suite
	38	+
	39	+# always use numpy's assert_equal
	40	+import numpy
	41	+assert_equal = numpy.testing.assert_equal

python/tests/run_all_tests+0−5

@@ -1,5 +0,0 @@
1		−#! /usr/bin/env python
2		−
3		−if __name__ == '__main__':
4		− import nose2.main
5		− nose2.discover()

python/tests/test_aubio.py+1−2

@@ -1,6 +1,5 @@
1	1	#! /usr/bin/env python
2	2
3		−from unittest import main
4	3	from numpy.testing import TestCase
5	4
6	5	class aubiomodule_test_case(TestCase):
@@ -15,5 +14,5 @@ class aubiomodule_test_case(TestCase): · 8 unmodified lines
15	14	self.assertEqual('0', aubio.version[0])
16	15
17	16	if __name__ == '__main__':
	17	+ from unittest import main
18	18	main()
19		−

python/tests/test_aubio_cmd.py+2−2

@@ -1,8 +1,7 @@
1	1	#! /usr/bin/env python
2	2
3		−import aubio.cmd
4		−from nose2 import main
5	3	from numpy.testing import TestCase
	4	+import aubio.cmd
6	5
7	6	class aubio_cmd(TestCase):
8	7
@@ -31,4 +30,5 @@ class aubio_cmd_utils(TestCase): · 22 unmodified lines
31	30	"3200\t")
32	31
33	32	if __name__ == '__main__':
	33	+ from unittest import main
34	34	main()

python/tests/test_aubio_cut.py+1−1

@@ -1,7 +1,6 @@
1	1	#! /usr/bin/env python
2	2
3	3	import aubio.cut
4		−from nose2 import main
5	4	from numpy.testing import TestCase
6	5
7	6	class aubio_cut(TestCase):
@@ -13,4 +12,5 @@ class aubio_cut(TestCase): · 5 unmodified lines
13	12	assert self.a_parser.parse_args(['-v']).verbose
14	13
15	14	if __name__ == '__main__':
	15	+ from unittest import main
16	16	main()

python/tests/test_cvec.py+1−1

@@ -1,6 +1,5 @@
1	1	#! /usr/bin/env python
2	2
3		−from unittest import main
4	3	import numpy as np
5	4	from numpy.testing import TestCase, assert_equal
6	5	from aubio import cvec, fvec, float_type
@@ -141,4 +140,5 @@ class aubio_cvec_wrong_norm_input(TestCase): · 134 unmodified lines
141	140	a.norm = np.zeros((512//2+1, 2), dtype = float_type)
142	141
143	142	if __name__ == '__main__':
	143	+ from unittest import main
144	144	main()

python/tests/test_dct.py+4−0

@@ -66,3 +66,7 @@ class aubio_dct(TestCase): · 65 unmodified lines
66	66	aubio.dct(size)
67	67	except AssertionError:
68	68	self.skipTest('creating aubio.dct with size %d did not fail' % size)
	69	+
	70	+if __name__ == '__main__':
	71	+ from unittest import main
	72	+ main()

python/tests/test_fft.py+1−1

@@ -1,6 +1,5 @@
1	1	#! /usr/bin/env python
2	2
3		−from unittest import main
4	3	from numpy.testing import TestCase
5	4	from numpy.testing import assert_equal, assert_almost_equal
6	5	import numpy as np
@@ -212,4 +211,5 @@ class aubio_fft_wrong_params(TestCase): · 205 unmodified lines
212	211	fft(win_s)
213	212
214	213	if __name__ == '__main__':
	214	+ from unittest import main
215	215	main()

python/tests/test_filter.py+2−2

@@ -1,9 +1,8 @@
1	1	#! /usr/bin/env python
2	2
3		−from unittest import main
4	3	from numpy.testing import TestCase, assert_equal, assert_almost_equal
5	4	from aubio import fvec, digital_filter
6		−from .utils import array_from_text_file
	5	+from utils import array_from_text_file
7	6
8	7	class aubio_filter_test_case(TestCase):
9	8
@@ -94,4 +93,5 @@ class aubio_filter_wrong_params(TestCase): · 84 unmodified lines
94	93	digital_filter(-1)
95	94
96	95	if __name__ == '__main__':
	96	+ from unittest import main
97	97	main()

python/tests/test_filterbank.py+3−3

@@ -4,7 +4,7 @@ import numpy as np · 3 unmodified lines
4	4	from numpy.testing import TestCase, assert_equal, assert_almost_equal
5	5
6	6	from aubio import cvec, filterbank, float_type
7		−from .utils import array_from_text_file
	7	+from utils import array_from_text_file
8	8
9	9	class aubio_filterbank_test_case(TestCase):
10	10
@@ -87,5 +87,5 @@ class aubio_filterbank_wrong_values(TestCase): · 76 unmodified lines
87	87	f(cvec(256))
88	88
89	89	if __name__ == '__main__':
90		− import nose2
91		− nose2.main()
	90	+ from unittest import main
	91	+ main()

python/tests/test_filterbank_mel.py+14−15

@@ -2,12 +2,10 @@ · 1 unmodified line
2	2
3	3	import numpy as np
4	4	from numpy.testing import TestCase, assert_equal, assert_almost_equal
	5	+from _tools import assert_warns
5	6
6	7	from aubio import fvec, cvec, filterbank, float_type
7	8
8		−import warnings
9		−warnings.filterwarnings('ignore', category=UserWarning, append=True)
10		−
11	9	class aubio_filterbank_mel_test_case(TestCase):
12	10
13	11	def test_slaney(self):
@@ -75,40 +73,41 @@ class aubio_filterbank_mel_test_case(TestCase): · 61 unmodified lines
75	73	samplerate = 22050
76	74	freq_list = [0, samplerate//4, samplerate // 2 + 1]
77	75	f = filterbank(len(freq_list)-2, 1024)
78		− # TODO add assert_warns
79		− f.set_triangle_bands(fvec(freq_list), samplerate)
	76	+ with assert_warns(UserWarning):
	77	+ f.set_triangle_bands(fvec(freq_list), samplerate)
80	78
81	79	def test_triangle_freqs_with_not_enough_filters(self):
82	80	"""make sure set_triangle_bands warns when not enough filters"""
83	81	samplerate = 22050
84	82	freq_list = [0, 100, 1000, 4000, 8000, 10000]
85	83	f = filterbank(len(freq_list)-3, 1024)
86		− # TODO add assert_warns
87		− f.set_triangle_bands(fvec(freq_list), samplerate)
	84	+ with assert_warns(UserWarning):
	85	+ f.set_triangle_bands(fvec(freq_list), samplerate)
88	86
89	87	def test_triangle_freqs_with_too_many_filters(self):
90	88	"""make sure set_triangle_bands warns when too many filters"""
91	89	samplerate = 22050
92	90	freq_list = [0, 100, 1000, 4000, 8000, 10000]
93	91	f = filterbank(len(freq_list)-1, 1024)
94		− # TODO add assert_warns
95		− f.set_triangle_bands(fvec(freq_list), samplerate)
	92	+ with assert_warns(UserWarning):
	93	+ f.set_triangle_bands(fvec(freq_list), samplerate)
96	94
97	95	def test_triangle_freqs_with_double_value(self):
98	96	"""make sure set_triangle_bands works with 2 duplicate freqs"""
99	97	samplerate = 22050
100	98	freq_list = [0, 100, 1000, 4000, 4000, 4000, 10000]
101	99	f = filterbank(len(freq_list)-2, 1024)
102		− # TODO add assert_warns
103		− f.set_triangle_bands(fvec(freq_list), samplerate)
	100	+ with assert_warns(UserWarning):
	101	+ f.set_triangle_bands(fvec(freq_list), samplerate)
104	102
105	103	def test_triangle_freqs_with_triple(self):
106	104	"""make sure set_triangle_bands works with 3 duplicate freqs"""
107	105	samplerate = 22050
108	106	freq_list = [0, 100, 1000, 4000, 4000, 4000, 10000]
109	107	f = filterbank(len(freq_list)-2, 1024)
110		− # TODO add assert_warns
111		− f.set_triangle_bands(fvec(freq_list), samplerate)
	108	+ with assert_warns(UserWarning):
	109	+ f.set_triangle_bands(fvec(freq_list), samplerate)
	110	+
112	111
113	112	def test_triangle_freqs_without_norm(self):
114	113	"""make sure set_triangle_bands works without """
@@ -168,5 +167,5 @@ class aubio_filterbank_mel_test_case(TestCase): · 53 unmodified lines
168	167
169	168
170	169	if __name__ == '__main__':
171		− import nose2
172		− nose2.main()
	170	+ from unittest import main
	171	+ main()

python/tests/test_fvec.py+1−1

@@ -1,6 +1,5 @@
1	1	#! /usr/bin/env python
2	2
3		−from unittest import main
4	3	import numpy as np
5	4	from numpy.testing import TestCase, assert_equal, assert_almost_equal
6	5	from aubio import fvec, zero_crossing_rate, alpha_norm, min_removal
@@ -148,4 +147,5 @@ class aubio_fvec_test_memory(TestCase): · 141 unmodified lines
148	147	del c
149	148
150	149	if __name__ == '__main__':
	150	+ from unittest import main
151	151	main()

python/tests/test_fvec_shift.py+1−1

@@ -30,6 +30,6 @@ class aubio_shift_test_case(TestCase): · 29 unmodified lines
30	30	def test_can_shift_fvec_odd(self):
31	31	self.run_shift_ishift(7)
32	32
33		−from unittest import main
34	33	if __name__ == '__main__':
	34	+ from unittest import main
35	35	main()

python/tests/test_hztomel.py+11−8

@@ -3,6 +3,7 @@ · 2 unmodified lines
3	3	from unittest import main
4	4	from numpy.testing import TestCase
5	5	from numpy.testing import assert_equal, assert_almost_equal
	6	+from _tools import assert_warns
6	7	import numpy as np
7	8	import aubio
8	9
@@ -37,12 +38,12 @@ class aubio_hztomel_test_case(TestCase): · 28 unmodified lines
37	38	assert_almost_equal(meltohz(hztomel(f)) - f, 0, decimal=1)
38	39
39	40	def test_meltohz_negative(self):
40		− # TODO add assert_warns
41		− assert_equal(meltohz(-1), 0)
	41	+ with assert_warns(UserWarning):
	42	+ assert_equal(meltohz(-1), 0)
42	43
43	44	def test_hztomel_negative(self):
44		− # TODO add assert_warns
45		− assert_equal(hztomel(-1), 0)
	45	+ with assert_warns(UserWarning):
	46	+ assert_equal(hztomel(-1), 0)
46	47
47	48
48	49	class aubio_hztomel_htk_test_case(TestCase):
@@ -57,14 +58,16 @@ class aubio_hztomel_htk_test_case(TestCase): · 8 unmodified lines
57	58	assert_almost_equal(hztomel(6300, htk=True), 2595., decimal=1)
58	59
59	60	def test_meltohz_negative(self):
60		− # TODO add assert_warns
61		− assert_equal(meltohz(-1, htk=True), 0)
	61	+ with assert_warns(UserWarning):
	62	+ assert_equal(meltohz(-1, htk=True), 0)
62	63	assert_almost_equal(meltohz(2000, htk=True), 3428.7, decimal=1)
63	64	assert_almost_equal(meltohz(1000, htk=True), 1000., decimal=1)
64	65
65	66	def test_hztomel_negative(self):
66		− # TODO add assert_warns
67		− assert_equal(hztomel(-1, htk=True), 0)
	67	+ with assert_warns(UserWarning):
	68	+ assert_equal(meltohz(-1, htk=True), 0)
	69	+ with assert_warns(UserWarning):
	70	+ assert_equal(hztomel(-1, htk=True), 0)
68	71	assert_almost_equal(hztomel(1000, htk=True), 1000., decimal=1)
69	72
70	73	def test_hztomel_htk(self):

python/tests/test_mathutils.py+1−1

@@ -1,6 +1,5 @@
1	1	#! /usr/bin/env python
2	2
3		−from unittest import main
4	3	from numpy.testing import TestCase, assert_equal
5	4	from numpy import array, arange, isnan, isinf
6	5	from aubio import bintomidi, miditobin, freqtobin, bintofreq, freqtomidi, miditofreq
@@ -101,4 +100,5 @@ class aubio_mathutils(TestCase): · 94 unmodified lines
101	100	assert_equal ( array(b) < 0, False )
102	101
103	102	if __name__ == '__main__':
	103	+ from unittest import main
104	104	main()

python/tests/test_mfcc.py+17−21

@@ -1,7 +1,6 @@
1	1	#! /usr/bin/env python
2	2
3		−from nose2 import main
4		−from nose2.tools import params
	3	+from _tools import parametrize, assert_raises
5	4	from numpy import random, count_nonzero
6	5	from numpy.testing import TestCase
7	6	from aubio import mfcc, cvec, float_type
@@ -15,28 +14,21 @@ samplerate = 44100 · 7 unmodified lines
15	14	new_params = ['buf_size', 'n_filters', 'n_coeffs', 'samplerate']
16	15	new_deflts = [1024, 40, 13, 44100]
17	16
18		−class aubio_mfcc(TestCase):
	17	+class Test_aubio_mfcc(object):
19	18
20		− def setUp(self):
21		− self.o = mfcc()
	19	+ members_args = 'name'
22	20
23		− def test_default_creation(self):
24		− pass
25		−
26		− def test_delete(self):
27		− del self.o
28		−
29		− @params(*new_params)
	21	+ @parametrize(members_args, new_params)
30	22	def test_read_only_member(self, name):
31		− o = self.o
32		− with self.assertRaises((TypeError, AttributeError)):
	23	+ o = mfcc()
	24	+ with assert_raises((TypeError, AttributeError)):
33	25	setattr(o, name, 0)
34	26
35		− @params(*zip(new_params, new_deflts))
	27	+ @parametrize('name, expected', zip(new_params, new_deflts))
36	28	def test_default_param(self, name, expected):
37	29	""" test mfcc.{:s} = {:d} """.format(name, expected)
38		− o = self.o
39		− self.assertEqual( getattr(o, name), expected)
	30	+ o = mfcc()
	31	+ assert getattr(o, name) == expected
40	32
41	33	class aubio_mfcc_wrong_params(TestCase):
42	34
@@ -82,9 +74,9 @@ class aubio_mfcc_compute(TestCase): · 39 unmodified lines
82	74	#print coeffs
83	75
84	76
85		−class aubio_mfcc_all_parameters(TestCase):
	77	+class Test_aubio_mfcc_all_parameters(object):
86	78
87		− @params(
	79	+ run_values = [
88	80	(2048, 40, 13, 44100),
89	81	(1024, 40, 13, 44100),
90	82	(512, 40, 13, 44100),
@@ -100,7 +92,10 @@ class aubio_mfcc_all_parameters(TestCase): · 9 unmodified lines
100	92	#(1024, 30, 20, 44100),
101	93	(1024, 40, 40, 44100),
102	94	(1024, 40, 3, 44100),
103		− )
	95	+ ]
	96	+ run_args = ['buf_size', 'n_filters', 'n_coeffs', 'samplerate']
	97	+
	98	+ @parametrize(run_args, run_values)
104	99	def test_run_with_params(self, buf_size, n_filters, n_coeffs, samplerate):
105	100	" check mfcc can run with reasonable parameters "
106	101	o = mfcc(buf_size, n_filters, n_coeffs, samplerate)
@@ -148,4 +143,5 @@ class aubio_mfcc_fb_params(TestCase): · 41 unmodified lines
148	143	assert m.get_scale() == 1
149	144
150	145	if __name__ == '__main__':
151		− main()
	146	+ from _tools import run_module_suite
	147	+ run_module_suite()

python/tests/test_midi2note.py+11−12

@@ -2,8 +2,7 @@ · 1 unmodified line
2	2	# -- coding: utf-8 --
3	3
4	4	from aubio import midi2note
5		−from nose2.tools import params
6		−import unittest
	5	+from _tools import parametrize, assert_raises
7	6
8	7	list_of_known_midis = (
9	8	( 0, 'C-1' ),
@@ -15,31 +14,31 @@ list_of_known_midis = ( · 5 unmodified lines
15	14	( 127, 'G9' ),
16	15	)
17	16
18		−class midi2note_good_values(unittest.TestCase):
	17	+class Test_midi2note_good_values(object):
19	18
20		− @params(*list_of_known_midis)
	19	+ @parametrize('midi, note', list_of_known_midis)
21	20	def test_midi2note_known_values(self, midi, note):
22	21	" known values are correctly converted "
23		− self.assertEqual ( midi2note(midi), note )
	22	+ assert midi2note(midi) == (note)
24	23
25		−class midi2note_wrong_values(unittest.TestCase):
	24	+class Test_midi2note_wrong_values(object):
26	25
27	26	def test_midi2note_negative_value(self):
28	27	" fails when passed a negative value "
29		− self.assertRaises(ValueError, midi2note, -2)
	28	+ assert_raises(ValueError, midi2note, -2)
30	29
31	30	def test_midi2note_large(self):
32	31	" fails when passed a value greater than 127 "
33		− self.assertRaises(ValueError, midi2note, 128)
	32	+ assert_raises(ValueError, midi2note, 128)
34	33
35	34	def test_midi2note_floating_value(self):
36	35	" fails when passed a floating point "
37		− self.assertRaises(TypeError, midi2note, 69.2)
	36	+ assert_raises(TypeError, midi2note, 69.2)
38	37
39	38	def test_midi2note_character_value(self):
40	39	" fails when passed a value that can not be transformed to integer "
41		− self.assertRaises(TypeError, midi2note, "a")
	40	+ assert_raises(TypeError, midi2note, "a")
42	41
43	42	if __name__ == '__main__':
44		− import nose2
45		− nose2.main()
	43	+ from _tools import run_module_suite
	44	+ run_module_suite()

python/tests/test_musicutils.py+2−2

@@ -1,9 +1,8 @@
1	1	#! /usr/bin/env python
2	2
3		−from unittest import main
4	3	import numpy as np
5	4	from numpy.testing import TestCase
6		−from numpy.testing.utils import assert_equal, assert_almost_equal
	5	+from numpy.testing import assert_equal, assert_almost_equal
7	6	from aubio import window, level_lin, db_spl, silence_detection, level_detection
8	7	from aubio import fvec, float_type
9	8
@@ -85,4 +84,5 @@ class aubio_level_detection(TestCase): · 75 unmodified lines
85	84	assert level_detection(ones(1024, dtype = float_type), -70) == 0
86	85
87	86	if __name__ == '__main__':
	87	+ from unittest import main
88	88	main()

python/tests/test_note2midi.py+24−19

@@ -4,8 +4,8 @@ · 3 unmodified lines
4	4	from __future__ import unicode_literals
5	5
6	6	from aubio import note2midi, freq2note, note2freq, float_type
7		−from nose2.tools import params
8		−import unittest
	7	+from numpy.testing import TestCase
	8	+from _tools import parametrize, assert_raises, skipTest
9	9
10	10	list_of_known_notes = (
11	11	( 'C-1', 0 ),
@@ -44,29 +44,32 @@ list_of_unknown_notes = ( · 32 unmodified lines
44	44	( '2' ),
45	45	)
46	46
47		−class note2midi_good_values(unittest.TestCase):
	47	+class Test_note2midi_good_values(object):
48	48
49		− @params(*list_of_known_notes)
	49	+ @parametrize('note, midi', list_of_known_notes)
50	50	def test_note2midi_known_values(self, note, midi):
51	51	" known values are correctly converted "
52		− self.assertEqual ( note2midi(note), midi )
	52	+ assert note2midi(note) == midi
53	53
54		− @params(*list_of_known_notes_with_unicode_issues)
	54	+ @parametrize('note, midi', list_of_known_notes_with_unicode_issues)
55	55	def test_note2midi_known_values_with_unicode_issues(self, note, midi):
56		− " known values are correctly converted, unless decoding is expected to fail"
	56	+ " difficult values are correctly converted unless expected failure "
57	57	try:
58		− self.assertEqual ( note2midi(note), midi )
	58	+ assert note2midi(note) == midi
59	59	except UnicodeEncodeError as e:
	60	+ # platforms with decoding failures include:
	61	+ # - osx: python <= 2.7.10
	62	+ # - win: python <= 2.7.12
60	63	import sys
61		− strfmt = "len(u'\\U0001D12A') != 1, excpected decoding failure \| {:s} \| {:s} {:s}"
62		− strres = strfmt.format(e, sys.platform, sys.version)
63		− # happens with: darwin 2.7.10, windows 2.7.12
	64	+ strmsg = "len(u'\\U0001D12A') != 1, expected decoding failure"
	65	+ strmsg += " \| upgrade to Python 3 to fix"
	66	+ strmsg += " \| {:s} \| {:s} {:s}"
64	67	if len('\U0001D12A') != 1 and sys.version[0] == '2':
65		− self.skipTest(strres + " \| upgrade to Python 3 to fix")
	68	+ skipTest(strmsg.format(repr(e), sys.platform, sys.version))
66	69	else:
67	70	raise
68	71
69		−class note2midi_wrong_values(unittest.TestCase):
	72	+class note2midi_wrong_values(TestCase):
70	73
71	74	def test_note2midi_missing_octave(self):
72	75	" fails when passed only one character"
@@ -104,12 +107,14 @@ class note2midi_wrong_values(unittest.TestCase): · 31 unmodified lines
104	107	" fails when passed a note with a note name longer than expected"
105	108	self.assertRaises(ValueError, note2midi, 'CB+-3')
106	109
107		− @params(*list_of_unknown_notes)
	110	+class Test_note2midi_unknown_values(object):
	111	+
	112	+ @parametrize('note', list_of_unknown_notes)
108	113	def test_note2midi_unknown_values(self, note):
109	114	" unknown values throw out an error "
110		− self.assertRaises(ValueError, note2midi, note)
	115	+ assert_raises(ValueError, note2midi, note)
111	116
112		−class freq2note_simple_test(unittest.TestCase):
	117	+class freq2note_simple_test(TestCase):
113	118
114	119	def test_freq2note_above(self):
115	120	" make sure freq2note(441) == A4 "
@@ -119,7 +124,7 @@ class freq2note_simple_test(unittest.TestCase): · 3 unmodified lines
119	124	" make sure freq2note(439) == A4 "
120	125	self.assertEqual("A4", freq2note(439))
121	126
122		−class note2freq_simple_test(unittest.TestCase):
	127	+class note2freq_simple_test(TestCase):
123	128
124	129	def test_note2freq(self):
125	130	" make sure note2freq('A3') == 220"
@@ -133,5 +138,5 @@ class note2freq_simple_test(unittest.TestCase): · 7 unmodified lines
133	138	self.assertLess(abs(note2freq("A4")-440), 1.e-12)
134	139
135	140	if __name__ == '__main__':
136		− import nose2
137		− nose2.main()
	141	+ from _tools import run_module_suite
	142	+ run_module_suite()

python/tests/test_notes.py+6−7

@@ -1,8 +1,11 @@
1	1	#! /usr/bin/env python
2	2
3		−from unittest import main
4	3	from numpy.testing import TestCase, assert_equal, assert_almost_equal
5		−from aubio import notes
	4	+from aubio import notes, source
	5	+import numpy as np
	6	+from utils import list_all_sounds
	7	+
	8	+list_of_sounds = list_all_sounds('sounds')
6	9
7	10	AUBIO_DEFAULT_NOTES_SILENCE = -70.
8	11	AUBIO_DEFAULT_NOTES_RELEASE_DROP = 10.
@@ -52,14 +55,9 @@ class aubio_notes_params(TestCase): · 43 unmodified lines
52	55	with self.assertRaises(ValueError):
53	56	self.o.set_release_drop(val)
54	57
55		−from .utils import list_all_sounds
56		−list_of_sounds = list_all_sounds('sounds')
57		−
58	58	class aubio_notes_sinewave(TestCase):
59	59
60	60	def analyze_file(self, filepath, samplerate=0):
61		− from aubio import source
62		− import numpy as np
63	61	win_s = 512 # fft size
64	62	hop_s = 256 # hop size
65	63
@@ -92,4 +90,5 @@ class aubio_notes_sinewave(TestCase): · 26 unmodified lines
92	90	assert_equal (results[0][1], [69, 123, -1])
93	91
94	92	if __name__ == '__main__':
	93	+ from unittest import main
95	94	main()

python/tests/test_onset.py+1−1

@@ -1,6 +1,5 @@
1	1	#! /usr/bin/env python
2	2
3		−from unittest import main
4	3	from numpy.testing import TestCase, assert_equal, assert_almost_equal
5	4	from aubio import onset, fvec
6	5
@@ -116,4 +115,5 @@ class aubio_onset_coverate(TestCase): · 109 unmodified lines
116	115
117	116
118	117	if __name__ == '__main__':
	118	+ from unittest import main
119	119	main()

python/tests/test_phasevoc.py+13−8

@@ -1,9 +1,8 @@
1	1	#! /usr/bin/env python
2	2
3	3	from numpy.testing import TestCase, assert_equal, assert_array_less
	4	+from _tools import parametrize
4	5	from aubio import fvec, cvec, pvoc, float_type
5		−from nose2 import main
6		−from nose2.tools import params
7	6	import numpy as np
8	7
9	8	if float_type == 'float32':
@@ -18,7 +17,7 @@ def create_sine(hop_s, freq, samplerate): · 8 unmodified lines
18	17	def create_noise(hop_s):
19	18	return np.random.rand(hop_s).astype(float_type) * 2. - 1.
20	19
21		−class aubio_pvoc_test_case(TestCase):
	20	+class Test_aubio_pvoc_test_case(object):
22	21	""" pvoc object test case """
23	22
24	23	def test_members_automatic_sizes_default(self):
@@ -65,7 +64,8 @@ class aubio_pvoc_test_case(TestCase): · 40 unmodified lines
65	64	r = f.rdo(s)
66	65	assert_equal ( t, 0.)
67	66
68		− @params(
	67	+ resynth_noise_args = "hop_s, ratio"
	68	+ resynth_noise_values = [
69	69	( 256, 8),
70	70	( 256, 4),
71	71	( 256, 2),
@@ -87,13 +87,16 @@ class aubio_pvoc_test_case(TestCase): · 15 unmodified lines
87	87	(8192, 8),
88	88	(8192, 4),
89	89	(8192, 2),
90		− )
	90	+ ]
	91	+
	92	+ @parametrize(resynth_noise_args, resynth_noise_values)
91	93	def test_resynth_steps_noise(self, hop_s, ratio):
92	94	""" check the resynthesis of a random signal is correct """
93	95	sigin = create_noise(hop_s)
94	96	self.reconstruction(sigin, hop_s, ratio)
95	97
96		− @params(
	98	+ resynth_sine_args = "samplerate, hop_s, ratio, freq"
	99	+ resynth_sine_values = [
97	100	(44100, 256, 8, 441),
98	101	(44100, 256, 4, 1203),
99	102	(44100, 256, 2, 3045),
@@ -108,7 +111,9 @@ class aubio_pvoc_test_case(TestCase): · 8 unmodified lines
108	111	(22050, 256, 8, 445),
109	112	(96000, 1024, 8, 47000),
110	113	(96000, 1024, 8, 20),
111		− )
	114	+ ]
	115	+
	116	+ @parametrize(resynth_sine_args, resynth_sine_values)
112	117	def test_resynth_steps_sine(self, samplerate, hop_s, ratio, freq):
113	118	""" check the resynthesis of a sine is correct """
114	119	sigin = create_sine(hop_s, freq, samplerate)
@@ -199,5 +204,5 @@ class aubio_pvoc_wrong_params(TestCase): · 84 unmodified lines
199	204	self.skipTest('creating aubio.pvoc with size %d did not fail' % win_s)
200	205
201	206	if __name__ == '__main__':
	207	+ from unittest import main
202	208	main()
203		−

python/tests/test_pitch.py+5−5

@@ -1,7 +1,6 @@
1	1	#! /usr/bin/env python
2	2
3		−from unittest import TestCase, main
4		−from numpy.testing import assert_equal
	3	+from numpy.testing import TestCase, assert_equal
5	4	from numpy import sin, arange, mean, median, isnan, pi
6	5	from aubio import fvec, pitch, freqtomidi, float_type
7	6
@@ -116,10 +115,11 @@ def create_test (algo, mode): · 108 unmodified lines
116	115
117	116	for algo in pitch_algorithms:
118	117	for mode in signal_modes:
119		− test_method = create_test (algo, mode)
120		− test_method.__name__ = 'test_pitch_%s_%d_%d_%dHz_sin_%.0f' % ( algo,
	118	+ _test_method = create_test (algo, mode)
	119	+ _test_method.__name__ = 'test_pitch_%s_%d_%d_%dHz_sin_%.0f' % ( algo,
121	120	mode[0], mode[1], mode[2], mode[3] )
122		− setattr (aubio_pitch_Sinusoid, test_method.__name__, test_method)
	121	+ setattr (aubio_pitch_Sinusoid, _test_method.__name__, _test_method)
123	122
124	123	if __name__ == '__main__':
	124	+ from unittest import main
125	125	main()

python/tests/test_sink.py+16−22

@@ -1,13 +1,9 @@
1	1	#! /usr/bin/env python
2	2
3		−from nose2 import main
4		−from nose2.tools import params
5	3	from numpy.testing import TestCase
6	4	from aubio import fvec, source, sink
7		−from .utils import list_all_sounds, get_tmp_sink_path, del_tmp_sink_path
8		−
9		−import warnings
10		−warnings.filterwarnings('ignore', category=UserWarning, append=True)
	5	+from utils import list_all_sounds, get_tmp_sink_path, del_tmp_sink_path
	6	+from _tools import parametrize, skipTest, assert_raises
11	7
12	8	list_of_sounds = list_all_sounds('sounds')
13	9	samplerates = [0, 44100, 8000, 32000]
@@ -23,30 +19,26 @@ for soundfile in list_of_sounds: · 9 unmodified lines
23	19	for samplerate in samplerates:
24	20	all_params.append((hop_size, samplerate, soundfile))
25	21
26		−class aubio_sink_test_case(TestCase):
27		−
28		− def setUp(self):
29		− if not len(list_of_sounds):
30		− self.skipTest('add some sound files in \'python/tests/sounds\'')
	22	+class Test_aubio_sink(object):
31	23
32	24	def test_wrong_filename(self):
33		− with self.assertRaises(RuntimeError):
	25	+ with assert_raises(RuntimeError):
34	26	sink('')
35	27
36	28	def test_wrong_samplerate(self):
37		− with self.assertRaises(RuntimeError):
	29	+ with assert_raises(RuntimeError):
38	30	sink(get_tmp_sink_path(), -1)
39	31
40	32	def test_wrong_samplerate_too_large(self):
41		− with self.assertRaises(RuntimeError):
	33	+ with assert_raises(RuntimeError):
42	34	sink(get_tmp_sink_path(), 1536001, 2)
43	35
44	36	def test_wrong_channels(self):
45		− with self.assertRaises(RuntimeError):
	37	+ with assert_raises(RuntimeError):
46	38	sink(get_tmp_sink_path(), 44100, -1)
47	39
48	40	def test_wrong_channels_too_large(self):
49		− with self.assertRaises(RuntimeError):
	41	+ with assert_raises(RuntimeError):
50	42	sink(get_tmp_sink_path(), 44100, 202020)
51	43
52	44	def test_many_sinks(self):
@@ -66,13 +58,13 @@ class aubio_sink_test_case(TestCase): · 13 unmodified lines
66	58	g.close()
67	59	shutil.rmtree(tmpdir)
68	60
69		− @params(*all_params)
	61	+ @parametrize('hop_size, samplerate, path', all_params)
70	62	def test_read_and_write(self, hop_size, samplerate, path):
71		−
72	63	try:
73	64	f = source(path, samplerate, hop_size)
74	65	except RuntimeError as e:
75		− self.skipTest('failed opening with hop_s = {:d}, samplerate = {:d} ({:s})'.format(hop_size, samplerate, str(e)))
	66	+ err_msg = '{:s} (hop_s = {:d}, samplerate = {:d})'
	67	+ skipTest(err_msg.format(str(e), hop_size, samplerate))
76	68	if samplerate == 0: samplerate = f.samplerate
77	69	sink_path = get_tmp_sink_path()
78	70	g = sink(sink_path, samplerate)
@@ -84,12 +76,13 @@ class aubio_sink_test_case(TestCase): · 5 unmodified lines
84	76	if read < f.hop_size: break
85	77	del_tmp_sink_path(sink_path)
86	78
87		− @params(*all_params)
	79	+ @parametrize('hop_size, samplerate, path', all_params)
88	80	def test_read_and_write_multi(self, hop_size, samplerate, path):
89	81	try:
90	82	f = source(path, samplerate, hop_size)
91	83	except RuntimeError as e:
92		− self.skipTest('failed opening with hop_s = {:d}, samplerate = {:d} ({:s})'.format(hop_size, samplerate, str(e)))
	84	+ err_msg = '{:s} (hop_s = {:d}, samplerate = {:d})'
	85	+ skipTest(err_msg.format(str(e), hop_size, samplerate))
93	86	if samplerate == 0: samplerate = f.samplerate
94	87	sink_path = get_tmp_sink_path()
95	88	g = sink(sink_path, samplerate, channels = f.channels)
@@ -125,4 +118,5 @@ class aubio_sink_test_case(TestCase): · 29 unmodified lines
125	118	g(vec, 128)
126	119
127	120	if __name__ == '__main__':
128		− main()
	121	+ from _tools import run_module_suite
	122	+ run_module_suite()

python/tests/test_slicing.py+3−3

@@ -1,10 +1,9 @@
1	1	#! /usr/bin/env python
2	2
3		−from unittest import main
4	3	from numpy.testing import TestCase, assert_equal
5	4	from aubio import slice_source_at_stamps
6		−from .utils import count_files_in_directory, get_default_test_sound
7		−from .utils import count_samples_in_directory, count_samples_in_file
	5	+from utils import count_files_in_directory, get_default_test_sound
	6	+from utils import count_samples_in_directory, count_samples_in_file
8	7
9	8	import tempfile
10	9	import shutil
@@ -167,4 +166,5 @@ class aubio_slicing_wrong_ends_test_case(TestCase): · 156 unmodified lines
167	166	shutil.rmtree(self.output_dir)
168	167
169	168	if __name__ == '__main__':
	169	+ from unittest import main
170	170	main()

python/tests/test_source.py+56−53

@@ -1,19 +1,17 @@
1	1	#! /usr/bin/env python
2	2
3		−from nose2 import main
4		−from nose2.tools import params
	3	+
5	4	from numpy.testing import TestCase, assert_equal
6	5	from aubio import source
7		−from .utils import list_all_sounds
8		−
9		−import warnings
10		−warnings.filterwarnings('ignore', category=UserWarning, append=True)
	6	+from utils import list_all_sounds
	7	+import unittest
	8	+from _tools import parametrize, assert_raises, assert_equal, skipTest
11	9
12	10	list_of_sounds = list_all_sounds('sounds')
13	11	samplerates = [0, 44100, 8000, 32000]
14	12	hop_sizes = [512, 1024, 64]
15	13
16		−path = None
	14	+default_test_sound = len(list_of_sounds) and list_of_sounds[0] or None
17	15
18	16	all_params = []
19	17	for soundfile in list_of_sounds:
@@ -21,24 +19,20 @@ for soundfile in list_of_sounds: · 1 unmodified line
21	19	for samplerate in samplerates:
22	20	all_params.append((hop_size, samplerate, soundfile))
23	21
	22	+no_sounds_msg = "no test sounds, add some in 'python/tests/sounds/'!"
24	23
25		−class aubio_source_test_case_base(TestCase):
26		−
27		− def setUp(self):
28		− if not len(list_of_sounds):
29		− self.skipTest('add some sound files in \'python/tests/sounds\'')
30		− self.default_test_sound = list_of_sounds[0]
	24	+_debug = False
31	25
32		−class aubio_source_test_case(aubio_source_test_case_base):
	26	+class Test_aubio_source_test_case(object):
33	27
34		− @params(*list_of_sounds)
	28	+ @parametrize('filename', list_of_sounds)
35	29	def test_close_file(self, filename):
36	30	samplerate = 0 # use native samplerate
37	31	hop_size = 256
38	32	f = source(filename, samplerate, hop_size)
39	33	f.close()
40	34
41		− @params(*list_of_sounds)
	35	+ @parametrize('filename', list_of_sounds)
42	36	def test_close_file_twice(self, filename):
43	37	samplerate = 0 # use native samplerate
44	38	hop_size = 256
@@ -46,7 +40,7 @@ class aubio_source_test_case(aubio_source_test_case_base): · 1 unmodified line
46	40	f.close()
47	41	f.close()
48	42
49		−class aubio_source_read_test_case(aubio_source_test_case_base):
	43	+class Test_aubio_source_read(object):
50	44
51	45	def read_from_source(self, f):
52	46	total_frames = 0
@@ -56,47 +50,51 @@ class aubio_source_read_test_case(aubio_source_test_case_base): · 3 unmodified lines
56	50	if read < f.hop_size:
57	51	assert_equal(samples[read:], 0)
58	52	break
59		− #result_str = "read {:.2f}s ({:d} frames in {:d} blocks at {:d}Hz) from {:s}"
60		− #result_params = total_frames / float(f.samplerate), total_frames, total_frames//f.hop_size, f.samplerate, f.uri
61		− #print (result_str.format(*result_params))
	53	+ if _debug:
	54	+ result_str = "read {:.2f}s ({:d} frames"
	55	+ result_str += " in {:d} blocks at {:d}Hz) from {:s}"
	56	+ result_params = total_frames / float(f.samplerate), total_frames, \
	57	+ total_frames//f.hop_size, f.samplerate, f.uri
	58	+ print (result_str.format(*result_params))
62	59	return total_frames
63	60
64		− @params(*all_params)
	61	+ @parametrize('hop_size, samplerate, soundfile', all_params)
65	62	def test_samplerate_hopsize(self, hop_size, samplerate, soundfile):
66	63	try:
67	64	f = source(soundfile, samplerate, hop_size)
68	65	except RuntimeError as e:
69		− self.skipTest('failed opening with hop_s = {:d}, samplerate = {:d} ({:s})'.format(hop_size, samplerate, str(e)))
	66	+ err_msg = 'failed opening with hop_s={:d}, samplerate={:d} ({:s})'
	67	+ skipTest(err_msg.format(hop_size, samplerate, str(e)))
70	68	assert f.samplerate != 0
71	69	read_frames = self.read_from_source(f)
72	70	if 'f_' in soundfile and samplerate == 0:
73	71	import re
74		− f = re.compile('._\([0:9]f\)_.*')
	72	+ f = re.compile(r'._\([0:9]f\)_.*')
75	73	match_f = re.findall('([0-9]*)f_', soundfile)
76	74	if len(match_f) == 1:
77	75	expected_frames = int(match_f[0])
78		− self.assertEqual(expected_frames, read_frames)
	76	+ assert_equal(expected_frames, read_frames)
79	77
80		− @params(*list_of_sounds)
	78	+ @parametrize('p', list_of_sounds)
81	79	def test_samplerate_none(self, p):
82	80	f = source(p)
83	81	assert f.samplerate != 0
84	82	self.read_from_source(f)
85	83
86		− @params(*list_of_sounds)
	84	+ @parametrize('p', list_of_sounds)
87	85	def test_samplerate_0(self, p):
88	86	f = source(p, 0)
89	87	assert f.samplerate != 0
90	88	self.read_from_source(f)
91	89
92		− @params(*list_of_sounds)
	90	+ @parametrize('p', list_of_sounds)
93	91	def test_zero_hop_size(self, p):
94	92	f = source(p, 0, 0)
95	93	assert f.samplerate != 0
96	94	assert f.hop_size != 0
97	95	self.read_from_source(f)
98	96
99		− @params(*list_of_sounds)
	97	+ @parametrize('p', list_of_sounds)
100	98	def test_seek_to_half(self, p):
101	99	from random import randint
102	100	f = source(p, 0, 0)
@@ -108,7 +106,7 @@ class aubio_source_read_test_case(aubio_source_test_case_base): · 5 unmodified lines
108	106	b = self.read_from_source(f)
109	107	assert a == b + c
110	108
111		− @params(*list_of_sounds)
	109	+ @parametrize('p', list_of_sounds)
112	110	def test_duration(self, p):
113	111	total_frames = 0
114	112	f = source(p)
@@ -117,43 +115,44 @@ class aubio_source_read_test_case(aubio_source_test_case_base): · 2 unmodified lines
117	115	_, read = f()
118	116	total_frames += read
119	117	if read < f.hop_size: break
120		− self.assertEqual(duration, total_frames)
	118	+ assert_equal (duration, total_frames)
121	119
122	120
123		−class aubio_source_test_wrong_params(TestCase):
	121	+class Test_aubio_source_wrong_params(object):
124	122
125	123	def test_wrong_file(self):
126		− with self.assertRaises(RuntimeError):
	124	+ with assert_raises(RuntimeError):
127	125	source('path_to/unexisting file.mp3')
128	126
129		−class aubio_source_test_wrong_params_with_file(aubio_source_test_case_base):
	127	+@unittest.skipIf(default_test_sound is None, no_sounds_msg)
	128	+class Test_aubio_source_wrong_params_with_file(TestCase):
130	129
131	130	def test_wrong_samplerate(self):
132		− with self.assertRaises(ValueError):
133		− source(self.default_test_sound, -1)
	131	+ with assert_raises(ValueError):
	132	+ source(default_test_sound, -1)
134	133
135	134	def test_wrong_hop_size(self):
136		− with self.assertRaises(ValueError):
137		− source(self.default_test_sound, 0, -1)
	135	+ with assert_raises(ValueError):
	136	+ source(default_test_sound, 0, -1)
138	137
139	138	def test_wrong_channels(self):
140		− with self.assertRaises(ValueError):
141		− source(self.default_test_sound, 0, 0, -1)
	139	+ with assert_raises(ValueError):
	140	+ source(default_test_sound, 0, 0, -1)
142	141
143	142	def test_wrong_seek(self):
144		− f = source(self.default_test_sound)
145		− with self.assertRaises(ValueError):
	143	+ f = source(default_test_sound)
	144	+ with assert_raises(ValueError):
146	145	f.seek(-1)
147	146
148	147	def test_wrong_seek_too_large(self):
149		− f = source(self.default_test_sound)
	148	+ f = source(default_test_sound)
150	149	try:
151		− with self.assertRaises(ValueError):
	150	+ with assert_raises(ValueError):
152	151	f.seek(f.duration + f.samplerate * 10)
153		− except AssertionError:
154		− self.skipTest('seeking after end of stream failed raising ValueError')
	152	+ except:
	153	+ skipTest('seeking after end of stream failed raising ValueError')
155	154
156		−class aubio_source_readmulti_test_case(aubio_source_read_test_case):
	155	+class Test_aubio_source_readmulti(Test_aubio_source_read):
157	156
158	157	def read_from_source(self, f):
159	158	total_frames = 0
@@ -163,15 +162,18 @@ class aubio_source_readmulti_test_case(aubio_source_read_test_case): · 3 unmodified lines
163	162	if read < f.hop_size:
164	163	assert_equal(samples[:,read:], 0)
165	164	break
166		− #result_str = "read {:.2f}s ({:d} frames in {:d} channels and {:d} blocks at {:d}Hz) from {:s}"
167		− #result_params = total_frames / float(f.samplerate), total_frames, f.channels, int(total_frames/f.hop_size), f.samplerate, f.uri
168		− #print (result_str.format(*result_params))
	165	+ if _debug:
	166	+ result_str = "read {:.2f}s ({:d} frames in {:d} channels"
	167	+ result_str += " and {:d} blocks at {:d}Hz) from {:s}"
	168	+ result_params = total_frames / float(f.samplerate), total_frames, \
	169	+ f.channels, int(total_frames/f.hop_size), \
	170	+ f.samplerate, f.uri
	171	+ print (result_str.format(*result_params))
169	172	return total_frames
170	173
171		−class aubio_source_with(aubio_source_test_case_base):
	174	+class Test_aubio_source_with(object):
172	175
173		− #@params(*list_of_sounds)
174		− @params(*list_of_sounds)
	176	+ @parametrize('filename', list_of_sounds)
175	177	def test_read_from_mono(self, filename):
176	178	total_frames = 0
177	179	hop_size = 2048
@@ -185,4 +187,5 @@ class aubio_source_with(aubio_source_test_case_base): · 7 unmodified lines
185	187	assert_equal(total_frames, input_source.duration)
186	188
187	189	if __name__ == '__main__':
188		− main()
	190	+ from _tools import run_module_suite
	191	+ run_module_suite()

python/tests/test_source_channels.py+1−1

@@ -8,7 +8,7 @@ import unittest · 7 unmodified lines
8	8	import aubio
9	9	import numpy as np
10	10	from numpy.testing import assert_equal
11		−from .utils import get_tmp_sink_path
	11	+from utils import get_tmp_sink_path
12	12
13	13	class aubio_source_test_case(unittest.TestCase):
14	14

python/tests/test_specdesc.py+1−1

@@ -1,6 +1,5 @@
1	1	#! /usr/bin/env python
2	2
3		−from unittest import main
4	3	from numpy.testing import TestCase, assert_equal, assert_almost_equal
5	4	from numpy import random, arange, log, zeros
6	5	from aubio import specdesc, cvec, float_type
@@ -229,4 +228,5 @@ class aubio_specdesc_wrong(TestCase): · 222 unmodified lines
229	228	specdesc("unknown", 512)
230	229
231	230	if __name__ == '__main__':
	231	+ from unittest import main
232	232	main()

python/tests/test_zero_crossing_rate.py+1−1

@@ -1,6 +1,5 @@
1	1	#! /usr/bin/env python
2	2
3		−from unittest import main
4	3	from numpy.testing import TestCase
5	4	from aubio import fvec, zero_crossing_rate
6	5
@@ -43,4 +42,5 @@ class zero_crossing_rate_test_case(TestCase): · 36 unmodified lines
43	42	self.assertEqual(2./buf_size, zero_crossing_rate(self.vector))
44	43
45	44	if __name__ == '__main__':
	45	+ from unittest import main
46	46	main()

python/tests/utils.py+6−12

@@ -8,11 +8,8 @@ from tempfile import mkstemp · 7 unmodified lines
8	8	DEFAULT_SOUND = '22050Hz_5s_brownnoise.wav'
9	9
10	10	def array_from_text_file(filename, dtype = 'float'):
11		− filename = os.path.join(os.path.dirname(__file__), filename)
12		− with open(filename) as f:
13		− lines = f.readlines()
14		− return np.array([line.split() for line in lines],
15		− dtype = dtype)
	11	+ realpathname = os.path.join(os.path.dirname(__file__), filename)
	12	+ return np.loadtxt(realpathname, dtype = dtype)
16	13
17	14	def list_all_sounds(rel_dir):
18	15	datadir = os.path.join(os.path.dirname(__file__), rel_dir)
@@ -38,13 +35,10 @@ def del_tmp_sink_path(path): · 19 unmodified lines
38	35	try:
39	36	os.unlink(path)
40	37	except WindowsError as e:
41		− print("deleting {:s} failed ({:s}), reopening".format(path, repr(e)))
42		− with open(path, 'wb') as f:
43		− f.close()
44		− try:
45		− os.unlink(path)
46		− except WindowsError as f:
47		− print("deleting {:s} failed ({:s}), aborting".format(path, repr(e)))
	38	+ # removing the temporary directory sometimes fails on windows
	39	+ import warnings
	40	+ errmsg = "failed deleting temporary file {:s} ({:s})"
	41	+ warnings.warn(UserWarning(errmsg.format(path, repr(e))))
48	42
49	43	def array_from_yaml_file(filename):
50	44	import yaml

Merge branch 'feature/pitchshift' into feature/timestretch

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code