From 3f4457aab1c4a453939bac884efada5fe3b861a7 Mon Sep 17 00:00:00 2001 From: Thomas Fillon Date: Mon, 20 Oct 2014 18:38:08 +0200 Subject: [PATCH] Fix(Import error): Move Aubio, Yaafe,and Vamp to timeside.analyzer.externals --- tests/test_aubio_melenergy.py | 2 +- tests/test_yaafe.py | 2 +- timeside/analyzer/{aubio => externals}/__init__.py | 0 timeside/analyzer/{aubio => externals}/aubio_melenergy.py | 0 timeside/analyzer/{aubio => externals}/aubio_mfcc.py | 0 timeside/analyzer/{aubio => externals}/aubio_pitch.py | 0 timeside/analyzer/{aubio => externals}/aubio_specdesc.py | 0 timeside/analyzer/{aubio => externals}/aubio_temporal.py | 0 timeside/analyzer/{ => externals}/vamp_plugin.py | 4 ++-- timeside/analyzer/{ => externals}/yaafe.py | 2 +- timeside/analyzer/irit_monopoly.py | 2 +- timeside/analyzer/limsi_sad.py | 2 +- timeside/tools/package.py | 2 +- 13 files changed, 8 insertions(+), 8 deletions(-) rename timeside/analyzer/{aubio => externals}/__init__.py (100%) rename timeside/analyzer/{aubio => externals}/aubio_melenergy.py (100%) rename timeside/analyzer/{aubio => externals}/aubio_mfcc.py (100%) rename timeside/analyzer/{aubio => externals}/aubio_pitch.py (100%) rename timeside/analyzer/{aubio => externals}/aubio_specdesc.py (100%) rename timeside/analyzer/{aubio => externals}/aubio_temporal.py (100%) rename timeside/analyzer/{ => externals}/vamp_plugin.py (98%) rename timeside/analyzer/{ => externals}/yaafe.py (98%) diff --git a/tests/test_aubio_melenergy.py b/tests/test_aubio_melenergy.py index 612da64..730e26f 100755 --- a/tests/test_aubio_melenergy.py +++ b/tests/test_aubio_melenergy.py @@ -18,7 +18,7 @@ class TestAubioMelEnergy(unittest.TestCase): self.source = ts_samples["sweep.wav"] def testOnGuitar(self): - "runs on guitar" + "runs on C4_scale" self.source = ts_samples["C4_scale.wav"] def tearDown(self): diff --git a/tests/test_yaafe.py b/tests/test_yaafe.py index 0d19ae1..93d0864 100755 --- a/tests/test_yaafe.py +++ b/tests/test_yaafe.py @@ -4,7 +4,7 @@ from unit_timeside import unittest, TestRunner from timeside.decoder.file import FileDecoder from timeside import _WITH_YAAFE if _WITH_YAAFE: - from timeside.analyzer.yaafe import Yaafe + from timeside.analyzer.externals.yaafe import Yaafe import os diff --git a/timeside/analyzer/aubio/__init__.py b/timeside/analyzer/externals/__init__.py similarity index 100% rename from timeside/analyzer/aubio/__init__.py rename to timeside/analyzer/externals/__init__.py diff --git a/timeside/analyzer/aubio/aubio_melenergy.py b/timeside/analyzer/externals/aubio_melenergy.py similarity index 100% rename from timeside/analyzer/aubio/aubio_melenergy.py rename to timeside/analyzer/externals/aubio_melenergy.py diff --git a/timeside/analyzer/aubio/aubio_mfcc.py b/timeside/analyzer/externals/aubio_mfcc.py similarity index 100% rename from timeside/analyzer/aubio/aubio_mfcc.py rename to timeside/analyzer/externals/aubio_mfcc.py diff --git a/timeside/analyzer/aubio/aubio_pitch.py b/timeside/analyzer/externals/aubio_pitch.py similarity index 100% rename from timeside/analyzer/aubio/aubio_pitch.py rename to timeside/analyzer/externals/aubio_pitch.py diff --git a/timeside/analyzer/aubio/aubio_specdesc.py b/timeside/analyzer/externals/aubio_specdesc.py similarity index 100% rename from timeside/analyzer/aubio/aubio_specdesc.py rename to timeside/analyzer/externals/aubio_specdesc.py diff --git a/timeside/analyzer/aubio/aubio_temporal.py b/timeside/analyzer/externals/aubio_temporal.py similarity index 100% rename from timeside/analyzer/aubio/aubio_temporal.py rename to timeside/analyzer/externals/aubio_temporal.py diff --git a/timeside/analyzer/vamp_plugin.py b/timeside/analyzer/externals/vamp_plugin.py similarity index 98% rename from timeside/analyzer/vamp_plugin.py rename to timeside/analyzer/externals/vamp_plugin.py index ae6df3c..658b818 100644 --- a/timeside/analyzer/vamp_plugin.py +++ b/timeside/analyzer/externals/vamp_plugin.py @@ -22,7 +22,7 @@ from timeside.core import implements, interfacedoc from timeside.analyzer.core import Analyzer from timeside.api import IAnalyzer -from ..tools.parameters import HasTraits, List +from timeside.tools.parameters import HasTraits, List import subprocess import numpy as np @@ -42,7 +42,7 @@ def simple_host_process(argslist): # Raise an exception if Vamp Host is missing -from ..exceptions import VampImportError +from timeside.exceptions import VampImportError try: simple_host_process(['-v']) WITH_VAMP = True diff --git a/timeside/analyzer/yaafe.py b/timeside/analyzer/externals/yaafe.py similarity index 98% rename from timeside/analyzer/yaafe.py rename to timeside/analyzer/externals/yaafe.py index fa6920e..eda7081 100644 --- a/timeside/analyzer/yaafe.py +++ b/timeside/analyzer/externals/yaafe.py @@ -29,7 +29,7 @@ from timeside.api import IAnalyzer import yaafelib import numpy from timeside.analyzer.preprocessors import downmix_to_mono -from ..tools.parameters import HasTraits, ListUnicode, Float +from timeside.tools.parameters import HasTraits, ListUnicode, Float class Yaafe(Analyzer): diff --git a/timeside/analyzer/irit_monopoly.py b/timeside/analyzer/irit_monopoly.py index 2b6c52b..20096ae 100644 --- a/timeside/analyzer/irit_monopoly.py +++ b/timeside/analyzer/irit_monopoly.py @@ -25,7 +25,7 @@ from timeside.analyzer.core import Analyzer from timeside.api import IAnalyzer import numpy from timeside.analyzer.preprocessors import frames_adapter -from timeside.analyzer.aubio.aubio_pitch import AubioPitch +from timeside.analyzer.externals.aubio_pitch import AubioPitch class IRITMonopoly(Analyzer): diff --git a/timeside/analyzer/limsi_sad.py b/timeside/analyzer/limsi_sad.py index 1311f44..7762f96 100644 --- a/timeside/analyzer/limsi_sad.py +++ b/timeside/analyzer/limsi_sad.py @@ -24,7 +24,7 @@ from timeside.analyzer.core import Analyzer from timeside.api import IAnalyzer import timeside -from ..tools.parameters import Enum, HasTraits, Float, Tuple +from timeside.tools.parameters import Enum, HasTraits, Float, Tuple import numpy as np import pickle diff --git a/timeside/tools/package.py b/timeside/tools/package.py index 57b2a37..a25a8b5 100644 --- a/timeside/tools/package.py +++ b/timeside/tools/package.py @@ -113,7 +113,7 @@ def check_vamp(): "Check Vamp host availability" try: - from ..analyzer import vamp_plugin + from timeside.analyzer.externals import vamp_plugin except VampImportError: warnings.warn('Vamp host is not available', ImportWarning, stacklevel=2) -- 2.39.5