From 6f1ad705e1cc9fb19b88c322d474b0173487830e Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@gmail.com>
Date: Sun, 8 Sep 2019 13:55:01 +0200
Subject: [PATCH] Fix power sequencer test failures
---
power_sequencer/operators/__init__.py | 2 +-
power_sequencer/operators/audiosync/mfcc/mfcc.py | 8 ++++----
power_sequencer/scripts/BPSProxy/setup.py | 4 ++--
power_sequencer/scripts/BPSRender/setup.py | 4 ++--
power_sequencer/tools/__init__.py | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/power_sequencer/operators/__init__.py b/power_sequencer/operators/__init__.py
index 535b29cd4..65f84902f 100755
--- a/power_sequencer/operators/__init__.py
+++ b/power_sequencer/operators/__init__.py
@@ -28,7 +28,7 @@ def get_operator_classes():
classes = []
print(__name__)
for path in module_paths:
- module = importlib.import_module(path, package="blender_power_sequencer.operators")
+ module = importlib.import_module(path, package="power_sequencer.operators")
operator_names = [entry for entry in dir(module) if entry.startswith("POWER_SEQUENCER_OT")]
classes.extend([getattr(module, name) for name in operator_names])
return classes
diff --git a/power_sequencer/operators/audiosync/mfcc/mfcc.py b/power_sequencer/operators/audiosync/mfcc/mfcc.py
index 7f90a5b17..d63c3e33c 100644
--- a/power_sequencer/operators/audiosync/mfcc/mfcc.py
+++ b/power_sequencer/operators/audiosync/mfcc/mfcc.py
@@ -16,10 +16,6 @@
#
import numpy as np
-from scipy.signal import hamming, lfilter
-from scipy.fftpack import fft
-from scipy.fftpack.realtransforms import dct
-
from .trfbank import trfbank
from .segment_axis import segment_axis
@@ -56,6 +52,10 @@ def mfcc(input, nwin=256, nfft=512, fs=16000, nceps=13):
spoken sentences", IEEE Trans. Acoustics. Speech, Signal Proc.
ASSP-28 (4): 357-366, August 1980."""
+ from scipy.signal import hamming, lfilter
+ from scipy.fftpack import fft
+ from scipy.fftpack.realtransforms import dct
+
# MFCC parameters: taken from auditory toolbox
over = nwin - 160
# Pre-emphasis factor (to take into account the -6dB/octave rolloff of the
diff --git a/power_sequencer/scripts/BPSProxy/setup.py b/power_sequencer/scripts/BPSProxy/setup.py
index 996ba3dbe..2581fe63d 100644
--- a/power_sequencer/scripts/BPSProxy/setup.py
+++ b/power_sequencer/scripts/BPSProxy/setup.py
@@ -14,8 +14,6 @@
# You should have received a copy of the GNU General Public License along with Power Sequencer. If
# not, see <https://www.gnu.org/licenses/>.
#
-from setuptools import setup
-
def readme():
with open("README.md") as f:
@@ -23,6 +21,8 @@ def readme():
if __name__ == "__main__":
+ from setuptools import setup
+
setup(
name="bpsproxy",
version="0.2.0",
diff --git a/power_sequencer/scripts/BPSRender/setup.py b/power_sequencer/scripts/BPSRender/setup.py
index 1f17b9bae..3d829d642 100644
--- a/power_sequencer/scripts/BPSRender/setup.py
+++ b/power_sequencer/scripts/BPSRender/setup.py
@@ -14,8 +14,6 @@
# You should have received a copy of the GNU General Public License along with Power Sequencer. If
# not, see <https://www.gnu.org/licenses/>.
#
-from setuptools import setup
-
def readme():
with open("README.rst") as f:
@@ -23,6 +21,8 @@ def readme():
if __name__ == "__main__":
+ from setuptools import setup
+
setup(
name="bpsrender",
version="0.1.40.post1",
diff --git a/power_sequencer/tools/__init__.py b/power_sequencer/tools/__init__.py
index 4c0e75ca3..463c3762e 100644
--- a/power_sequencer/tools/__init__.py
+++ b/power_sequencer/tools/__init__.py
@@ -27,7 +27,7 @@ def get_tool_classes():
module_paths = ["." + os.path.splitext(f)[0] for f in module_files]
classes = []
for path in module_paths:
- module = importlib.import_module(path, package="blender_power_sequencer.tools")
+ module = importlib.import_module(path, package="power_sequencer.tools")
tool_names = [entry for entry in dir(module) if entry.startswith("POWER_SEQUENCER_TOOL")]
classes.extend([getattr(module, name) for name in tool_names])
return classes
--
GitLab