From a64b2a63f65652ea43ea85cd0a532d7ec3da44ac Mon Sep 17 00:00:00 2001 From: Thomas Fillon Date: Mon, 5 Jan 2015 15:09:18 +0100 Subject: [PATCH] Move code to plugins directory and update code after TimeSide refactoring The 'plugins' directory becomes the common namespace package for TimeSide plugins" Also: - Update requirements with TimeSide test branch on Github - Fix namespace packages importing - Travis-CI: update travis.yml test section for namespace package --- .travis.yml | 13 +++++++------ requirements.txt | 3 ++- setup.py | 6 +++--- timeside/__init__.py | 3 +-- timeside/plugins/__init__.py | 5 +++++ .../{extensions => plugins}/diadems/__init__.py | 0 .../diadems/irit_monopoly.py | 9 ++++----- .../diadems/irit_noise_startSilences.py | 7 +++---- .../diadems/irit_speech_4hz.py | 9 ++++----- .../diadems/irit_speech_entropy.py | 8 ++++---- .../{extensions => plugins}/diadems/limsi_sad.py | 8 +++----- .../irit_noise_startSilences_proto1.dat | Bin .../irit_noise_startSilences_proto2.dat | Bin .../diadems/trained_models/limsi_sad_etape.pkl | 0 .../diadems/trained_models/limsi_sad_maya.pkl | 0 timeside/{extensions => plugins}/diadems/utils.py | 0 16 files changed, 36 insertions(+), 35 deletions(-) create mode 100644 timeside/plugins/__init__.py rename timeside/{extensions => plugins}/diadems/__init__.py (100%) rename timeside/{extensions => plugins}/diadems/irit_monopoly.py (95%) rename timeside/{extensions => plugins}/diadems/irit_noise_startSilences.py (97%) rename timeside/{extensions => plugins}/diadems/irit_speech_4hz.py (96%) rename timeside/{extensions => plugins}/diadems/irit_speech_entropy.py (93%) rename timeside/{extensions => plugins}/diadems/limsi_sad.py (98%) rename timeside/{extensions => plugins}/diadems/trained_models/irit_noise_startSilences_proto1.dat (100%) rename timeside/{extensions => plugins}/diadems/trained_models/irit_noise_startSilences_proto2.dat (100%) rename timeside/{extensions => plugins}/diadems/trained_models/limsi_sad_etape.pkl (100%) rename timeside/{extensions => plugins}/diadems/trained_models/limsi_sad_maya.pkl (100%) rename timeside/{extensions => plugins}/diadems/utils.py (100%) diff --git a/.travis.yml b/.travis.yml index 4c73bfd..2ba221e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,17 +15,18 @@ before_install: # command to install dependencies install: -# - "pip install -r requirements.txt --use-mirrors" -- python setup.py install + - pip install -r requirements.txt + - python setup.py install # command to run tests before_script: -- pip install -U coverage -- pip install coveralls + - pip install -U coverage + - pip install coveralls script: - - coverage run --source=timeside --omit=timeside/analyzer/aubio/aubio_*.py,timeside/analyzer/yaafe.py,timeside/analyzer/limsi_sad.py,timeside/analyzer/vamp_plugin.py setup.py test + - python -c"import timeside.core; timeside.core.processor.list_processors()" + #- coverage run --source=timeside --omit=timeside/analyzer/aubio/aubio_*.py,timeside/analyzer/yaafe.py,timeside/analyzer/limsi_sad.py,timeside/analyzer/vamp_plugin.py setup.py test after_success: - - coveralls \ No newline at end of file + #- coveralls \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 897fb90..d4e2778 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ setuptools --e . \ No newline at end of file +git+git://github.com/Parisson/TimeSide.git@ts_extensions#egg=TimeSide +-e . diff --git a/setup.py b/setup.py index 8f4cb34..68db478 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- -from setuptools import setup +from setuptools import setup, find_packages import sys from setuptools.command.test import test as TestCommand @@ -40,8 +40,8 @@ KEYWORDS = 'audio analysis features extraction MIR transcoding graph visualize p setup( # Package - namespace_packages = ['timeside'], - packages=['timeside.extensions'], + namespace_packages = ['timeside', 'timeside.plugins'], + packages=find_packages(), install_requires=[ 'timeside', ], diff --git a/timeside/__init__.py b/timeside/__init__.py index 77c8cac..07801a3 100644 --- a/timeside/__init__.py +++ b/timeside/__init__.py @@ -1,5 +1,4 @@ #!/usr/bin/env python # encoding: utf-8 - - __import__('pkg_resources').declare_namespace(__name__) + diff --git a/timeside/plugins/__init__.py b/timeside/plugins/__init__.py new file mode 100644 index 0000000..77c8cac --- /dev/null +++ b/timeside/plugins/__init__.py @@ -0,0 +1,5 @@ +#!/usr/bin/env python +# encoding: utf-8 + + +__import__('pkg_resources').declare_namespace(__name__) diff --git a/timeside/extensions/diadems/__init__.py b/timeside/plugins/diadems/__init__.py similarity index 100% rename from timeside/extensions/diadems/__init__.py rename to timeside/plugins/diadems/__init__.py diff --git a/timeside/extensions/diadems/irit_monopoly.py b/timeside/plugins/diadems/irit_monopoly.py similarity index 95% rename from timeside/extensions/diadems/irit_monopoly.py rename to timeside/plugins/diadems/irit_monopoly.py index 20096ae..cbc48ad 100644 --- a/timeside/extensions/diadems/irit_monopoly.py +++ b/timeside/plugins/diadems/irit_monopoly.py @@ -19,13 +19,12 @@ # Author: Maxime Le Coz from __future__ import absolute_import -from timeside.analyzer.utils import segmentFromValues +from timeside.plugins.analyzer.utils import segmentFromValues from timeside.core import implements, interfacedoc -from timeside.analyzer.core import Analyzer -from timeside.api import IAnalyzer +from timeside.core.analyzer import Analyzer, IAnalyzer import numpy -from timeside.analyzer.preprocessors import frames_adapter -from timeside.analyzer.externals.aubio_pitch import AubioPitch +from timeside.core.preprocessors import frames_adapter +from timeside.plugins.analyzer.externals.aubio_pitch import AubioPitch class IRITMonopoly(Analyzer): diff --git a/timeside/extensions/diadems/irit_noise_startSilences.py b/timeside/plugins/diadems/irit_noise_startSilences.py similarity index 97% rename from timeside/extensions/diadems/irit_noise_startSilences.py rename to timeside/plugins/diadems/irit_noise_startSilences.py index e820b93..9b38584 100644 --- a/timeside/extensions/diadems/irit_noise_startSilences.py +++ b/timeside/plugins/diadems/irit_noise_startSilences.py @@ -22,10 +22,9 @@ from __future__ import absolute_import import timeside from timeside.core import implements, interfacedoc -from timeside.analyzer.core import Analyzer -from timeside.analyzer.preprocessors import frames_adapter -from timeside.api import IAnalyzer -from timeside.analyzer.utils import MACHINE_EPSILON +from timeside.core.analyzer import Analyzer, IAnalyzer +from timeside.core.preprocessors import frames_adapter +from timeside.plugins.analyzer.utils import MACHINE_EPSILON from timeside.tools.buffering import BufferTable import numpy diff --git a/timeside/extensions/diadems/irit_speech_4hz.py b/timeside/plugins/diadems/irit_speech_4hz.py similarity index 96% rename from timeside/extensions/diadems/irit_speech_4hz.py rename to timeside/plugins/diadems/irit_speech_4hz.py index dd24bf2..d40872b 100644 --- a/timeside/extensions/diadems/irit_speech_4hz.py +++ b/timeside/plugins/diadems/irit_speech_4hz.py @@ -20,14 +20,13 @@ # Author: Maxime Le Coz from timeside.core import implements, interfacedoc -from timeside.analyzer.core import Analyzer -from timeside.analyzer.utils import melFilterBank, computeModulation -from timeside.analyzer.utils import segmentFromValues -from timeside.api import IAnalyzer +from timeside.core.analyzer import Analyzer, IAnalyzer +from timeside.plugins.analyzer.utils import melFilterBank, computeModulation +from timeside.plugins.analyzer.utils import segmentFromValues import numpy as np from numpy.fft import rfft from scipy.signal import firwin, lfilter -from timeside.analyzer.preprocessors import frames_adapter +from timeside.core.preprocessors import frames_adapter from timeside.tools.parameters import Float, HasTraits diff --git a/timeside/extensions/diadems/irit_speech_entropy.py b/timeside/plugins/diadems/irit_speech_entropy.py similarity index 93% rename from timeside/extensions/diadems/irit_speech_entropy.py rename to timeside/plugins/diadems/irit_speech_entropy.py index 4134e54..08d6cbf 100644 --- a/timeside/extensions/diadems/irit_speech_entropy.py +++ b/timeside/plugins/diadems/irit_speech_entropy.py @@ -20,10 +20,10 @@ # Author: Maxime Le Coz from timeside.core import implements, interfacedoc -from timeside.analyzer.core import Analyzer -from timeside.analyzer.utils import entropy, computeModulation -from timeside.analyzer.utils import segmentFromValues -from timeside.api import IAnalyzer +from timeside.core.analyzer import Analyzer +from timeside.plugins.analyzer.utils import entropy, computeModulation +from timeside.plugins.analyzer.utils import segmentFromValues +from timeside.core.api import IAnalyzer from numpy import array from scipy.ndimage.morphology import binary_opening diff --git a/timeside/extensions/diadems/limsi_sad.py b/timeside/plugins/diadems/limsi_sad.py similarity index 98% rename from timeside/extensions/diadems/limsi_sad.py rename to timeside/plugins/diadems/limsi_sad.py index 7762f96..246e4f2 100644 --- a/timeside/extensions/diadems/limsi_sad.py +++ b/timeside/plugins/diadems/limsi_sad.py @@ -19,10 +19,8 @@ # Author: David Doukhan -from timeside.core import implements, interfacedoc, get_processor -from timeside.analyzer.core import Analyzer -from timeside.api import IAnalyzer -import timeside +from timeside.core import implements, interfacedoc, get_processor, _WITH_YAAFE +from timeside.core.analyzer import Analyzer, IAnalyzer from timeside.tools.parameters import Enum, HasTraits, Float, Tuple @@ -31,7 +29,7 @@ import pickle import os.path # Require Yaafe -if not timeside._WITH_YAAFE: +if not _WITH_YAAFE: raise ImportError('yaafelib must be missing') diff --git a/timeside/extensions/diadems/trained_models/irit_noise_startSilences_proto1.dat b/timeside/plugins/diadems/trained_models/irit_noise_startSilences_proto1.dat similarity index 100% rename from timeside/extensions/diadems/trained_models/irit_noise_startSilences_proto1.dat rename to timeside/plugins/diadems/trained_models/irit_noise_startSilences_proto1.dat diff --git a/timeside/extensions/diadems/trained_models/irit_noise_startSilences_proto2.dat b/timeside/plugins/diadems/trained_models/irit_noise_startSilences_proto2.dat similarity index 100% rename from timeside/extensions/diadems/trained_models/irit_noise_startSilences_proto2.dat rename to timeside/plugins/diadems/trained_models/irit_noise_startSilences_proto2.dat diff --git a/timeside/extensions/diadems/trained_models/limsi_sad_etape.pkl b/timeside/plugins/diadems/trained_models/limsi_sad_etape.pkl similarity index 100% rename from timeside/extensions/diadems/trained_models/limsi_sad_etape.pkl rename to timeside/plugins/diadems/trained_models/limsi_sad_etape.pkl diff --git a/timeside/extensions/diadems/trained_models/limsi_sad_maya.pkl b/timeside/plugins/diadems/trained_models/limsi_sad_maya.pkl similarity index 100% rename from timeside/extensions/diadems/trained_models/limsi_sad_maya.pkl rename to timeside/plugins/diadems/trained_models/limsi_sad_maya.pkl diff --git a/timeside/extensions/diadems/utils.py b/timeside/plugins/diadems/utils.py similarity index 100% rename from timeside/extensions/diadems/utils.py rename to timeside/plugins/diadems/utils.py -- 2.39.5