[Bf-extensions-cvs] [69d8bf08] master: Fix script_load_modules test failures in power sequencer

Brecht Van Lommel noreply at git.blender.org
Sun Sep 8 15:16:50 CEST 2019


Commit: 69d8bf08be9c77c02b130c53495da1a56f9879e3
Author: Brecht Van Lommel
Date:   Sun Sep 8 13:55:01 2019 +0200
Branches: master
https://developer.blender.org/rBA69d8bf08be9c77c02b130c53495da1a56f9879e3

Fix script_load_modules test failures in power sequencer

===================================================================

M	power_sequencer/operators/audiosync/mfcc/mfcc.py
M	power_sequencer/scripts/BPSProxy/setup.py
M	power_sequencer/scripts/BPSRender/setup.py

===================================================================

diff --git a/power_sequencer/operators/audiosync/mfcc/mfcc.py b/power_sequencer/operators/audiosync/mfcc/mfcc.py
index 93709e8c..5d9c9467 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 99453b04..f1dc3f59 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.rst") as f:
@@ -23,6 +21,8 @@ def readme():
 
 
 if __name__ == "__main__":
+    from setuptools import setup
+
     setup(
         name="bpsproxy",
         version="0.1.3.post1",
diff --git a/power_sequencer/scripts/BPSRender/setup.py b/power_sequencer/scripts/BPSRender/setup.py
index 1f17b9ba..3d829d64 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",



More information about the Bf-extensions-cvs mailing list