Merge pull request #43 from wantysal/plt_suppress

matpltolib dependency made optional

Author: Martin Glesser

mosqito/functions/loudness_ecma/comp_loudness.py

@@ -3,7 +3,6 @@
 @author: Daniel Jiménez-Caminero Costa
 """
 import numpy as np
-import matplotlib.pyplot as plt
 
 # Project Imports
 from mosqito.functions.loudness_ecma.rectified_band_pass_signals import (

mosqito/functions/loudness_ecma/equal_loudness_contours.py

@@ -4,10 +4,6 @@
 """
 
 import numpy as np
-import math
-import scipy as sp
-import matplotlib.pyplot as plt
-from scipy.signal import welch
 
 
 def equal_loudness_contours(phones):

mosqito/functions/loudness_ecma/gammatone.py

@@ -1,6 +1,13 @@
+try:
+    import matplotlib.pyplot as plt
+except ImportError:
+    raise RuntimeError(
+        "In order to perform this validation you need the 'matplotlib' package."
+        )
+
+
 from scipy.special import comb
 from scipy.signal import freqz
-import matplotlib.pyplot as plt
 from numpy import (
     abs as np_abs,
     arange,

requirements.txt

@@ -1,3 +1,2 @@
 numpy
 scipy
-matplotlib

setup.py

@@ -16,7 +16,7 @@
         requirements
     ).splitlines()  # remove endline in each element
 
-tests_require = ["pytest>=5.4.1", "pandas", "openpyxl", "SciDataTool"]
+tests_require = ["pytest>=5.4.1", "pandas", "openpyxl", "SciDataTool", "matplotlib"]
 uff_require = ["pyuff"]
 scidatatool_require = ["SciDataTool"]
 all_require = tests_require + uff_require

validations/loudness_ecma/hearing_model_validation.py

@@ -1,7 +1,12 @@
 # -*- coding: utf-8 -*-
+# Optional package import
+try:
+    import matplotlib.pyplot as plt
+except ImportError:
+    plt = None
+
 
 import numpy as np
-import matplotlib.pyplot as plt
 from scipy.optimize import root_scalar
 
 # Project Imports
@@ -55,6 +60,10 @@ def hearing_model_validation():
     """Validation of the ECMA loudness implementation according
     to ECMA-418-2 annex A
     """
+    if plt is None:
+        raise RuntimeError(
+            "In order to make this validation plot you need the 'matplotlib' package."
+            )
 
     phons = [80, 60, 40, 20]
 

validations/loudness_ecma/output/comparison_auditory_filter.png

@@ -1,4 +1,11 @@
 # -*- coding: utf-8 -*-
+try:
+    import matplotlib.pyplot as plt
+except ImportError:
+    raise RuntimeError(
+        "In order to perform this validation you need the 'matplotlib' package."
+        )
+
 
 import scipy.signal as sp_signal
 from numpy import (
@@ -8,7 +15,7 @@
     sqrt,
     mean,
 )
-import matplotlib.pyplot as plt
+
 
 from mosqito.functions.loudness_ecma.ear_filter_design import ear_filter_design
 from mosqito.functions.shared.sine_wave_generator import (
@@ -64,6 +71,7 @@
 plt.semilogx(freq, level, "o", label="Filtered sine signal")
 plt.legend()
 plt.savefig(
-    "./validations/loudness_ecma/output/" + "validation_ear_filter_design.png",
+    "./output/" + "validation_ear_filter_design.png",
     format="png",
-)
+)
+plt.clf()