From 238e93a06baad41ad3a9f218cb19ac3e0b427c99 Mon Sep 17 00:00:00 2001
From: Florent Jaillet <florent.jaillet@lis-lab.fr>
Date: Wed, 14 Nov 2018 14:48:24 +0100
Subject: [PATCH] Avoid errors and warnings in tests with recent versions of
the dependencies
---
VERSION | 2 +-
doc/copyright.rst | 2 +-
ltfatpy/__init__.py | 4 +-
ltfatpy/comp/arg_firwin.py | 2 +-
ltfatpy/comp/assert_groworder.py | 2 +-
ltfatpy/comp/assert_sigreshape_post.py | 2 +-
ltfatpy/comp/assert_sigreshape_pre.py | 2 +-
ltfatpy/comp/comp_dct.pyx | 2 +-
ltfatpy/comp/comp_dst.pyx | 2 +-
ltfatpy/comp/comp_gabdual_long.pyx | 2 +-
ltfatpy/comp/comp_gabtight_long.pyx | 2 +-
ltfatpy/comp/comp_hermite.py | 2 +-
ltfatpy/comp/comp_hermite_all.py | 2 +-
ltfatpy/comp/comp_isepdgt.pyx | 2 +-
ltfatpy/comp/comp_isepdgtreal.pyx | 2 +-
ltfatpy/comp/comp_pgauss.pyx | 2 +-
ltfatpy/comp/comp_sepdgt.pyx | 2 +-
ltfatpy/comp/comp_sepdgtreal.pyx | 2 +-
ltfatpy/comp/comp_sigreshape_post.py | 2 +-
ltfatpy/comp/comp_sigreshape_pre.py | 2 +-
ltfatpy/comp/comp_window.py | 2 +-
ltfatpy/comp/gabpars_from_windowsignal.py | 2 +-
ltfatpy/comp/ltfat.pxd | 2 +-
ltfatpy/fourier/dcti.py | 2 +-
ltfatpy/fourier/dctii.py | 2 +-
ltfatpy/fourier/dctiii.py | 2 +-
ltfatpy/fourier/dctiv.py | 2 +-
ltfatpy/fourier/dft.py | 2 +-
ltfatpy/fourier/dsti.py | 2 +-
ltfatpy/fourier/dstii.py | 2 +-
ltfatpy/fourier/dstiii.py | 2 +-
ltfatpy/fourier/dstiv.py | 2 +-
ltfatpy/fourier/fftindex.py | 2 +-
ltfatpy/fourier/fftreal.py | 2 +-
ltfatpy/fourier/fftresample.py | 2 +-
ltfatpy/fourier/idft.py | 2 +-
ltfatpy/fourier/ifftreal.py | 2 +-
ltfatpy/fourier/isevenfunction.py | 2 +-
ltfatpy/fourier/middlepad.py | 2 +-
ltfatpy/fourier/pderiv.py | 2 +-
ltfatpy/fourier/pgauss.py | 2 +-
ltfatpy/fourier/pherm.py | 2 +-
ltfatpy/fourier/psech.py | 2 +-
ltfatpy/gabor/dgt.py | 2 +-
ltfatpy/gabor/dgtlength.py | 2 +-
ltfatpy/gabor/dgtreal.py | 2 +-
ltfatpy/gabor/gabdual.py | 2 +-
ltfatpy/gabor/gabframediag.py | 2 +-
ltfatpy/gabor/gabimagepars.py | 2 +-
ltfatpy/gabor/gabphasegrad.py | 2 +-
ltfatpy/gabor/gabtight.py | 2 +-
ltfatpy/gabor/gabwin.py | 2 +-
ltfatpy/gabor/idgt.py | 2 +-
ltfatpy/gabor/idgtreal.py | 2 +-
ltfatpy/gabor/instfreqplot.py | 2 +-
ltfatpy/gabor/phaselock.py | 2 +-
ltfatpy/gabor/phaseplot.py | 2 +-
ltfatpy/gabor/phaseunlock.py | 2 +-
ltfatpy/gabor/plotdgt.py | 2 +-
ltfatpy/gabor/plotdgtreal.py | 2 +-
ltfatpy/gabor/s0norm.py | 2 +-
ltfatpy/gabor/sgram.py | 2 +-
ltfatpy/gabor/tfplot.py | 2 +-
ltfatpy/signals/greasy.py | 2 +-
ltfatpy/signals/gspi.py | 2 +-
ltfatpy/signals/linus.py | 2 +-
ltfatpy/sigproc/fir2long.py | 2 +-
ltfatpy/sigproc/firkaiser.py | 2 +-
ltfatpy/sigproc/firwin.py | 2 +-
ltfatpy/sigproc/groupthresh.py | 2 +-
ltfatpy/sigproc/largestn.py | 2 +-
ltfatpy/sigproc/largestr.py | 2 +-
ltfatpy/sigproc/long2fir.py | 2 +-
ltfatpy/sigproc/normalize.py | 2 +-
ltfatpy/sigproc/rms.py | 2 +-
ltfatpy/sigproc/thresh.py | 2 +-
.../tests/comp/test_assert_sigreshape_post.py | 2 +-
.../tests/comp/test_assert_sigreshape_pre.py | 2 +-
ltfatpy/tests/comp/test_comp_dct.py | 2 +-
ltfatpy/tests/comp/test_comp_dst.py | 2 +-
ltfatpy/tests/comp/test_comp_gabdual.py | 12 +++--
ltfatpy/tests/comp/test_comp_hermite.py | 2 +-
ltfatpy/tests/comp/test_comp_hermite_all.py | 2 +-
ltfatpy/tests/comp/test_comp_isepdgt.py | 2 +-
ltfatpy/tests/comp/test_comp_pgauss.py | 2 +-
ltfatpy/tests/comp/test_comp_sepdgt.py | 2 +-
ltfatpy/tests/comp/test_comp_sigreshape.py | 2 +-
ltfatpy/tests/datasets/get_dataset_path.py | 2 +-
.../datasets/read_comp_dct_signal_ex_mat.py | 2 +-
.../datasets/read_comp_dst_signal_ex_mat.py | 2 +-
.../tests/datasets/read_dgt_signal_ex_mat.py | 2 +-
.../read_gabframediag_signal_ex_mat.py | 2 +-
.../datasets/read_gabtight_signal_ex_mat.py | 2 +-
ltfatpy/tests/datasets/read_ref_mat.py | 2 +-
ltfatpy/tests/datasets/read_s0norm_ex_mat.py | 2 +-
.../datasets/test_read_dgt_signal_ext.py | 15 ++++--
ltfatpy/tests/datasets/test_read_ref_mat.py | 2 +-
ltfatpy/tests/fourier/test_dct.py | 2 +-
ltfatpy/tests/fourier/test_dft.py | 2 +-
ltfatpy/tests/fourier/test_dst.py | 2 +-
ltfatpy/tests/fourier/test_fftindex.py | 2 +-
ltfatpy/tests/fourier/test_fftreal.py | 2 +-
ltfatpy/tests/fourier/test_fftresample.py | 2 +-
ltfatpy/tests/fourier/test_idft.py | 2 +-
ltfatpy/tests/fourier/test_ifftreal.py | 2 +-
ltfatpy/tests/fourier/test_isevenfunction.py | 2 +-
ltfatpy/tests/fourier/test_middlepad.py | 2 +-
ltfatpy/tests/fourier/test_pderiv.py | 2 +-
ltfatpy/tests/fourier/test_pgauss.py | 2 +-
ltfatpy/tests/fourier/test_pherm.py | 2 +-
ltfatpy/tests/fourier/test_psech.py | 6 +--
ltfatpy/tests/gabor/test_dgt.py | 2 +-
ltfatpy/tests/gabor/test_gabdual.py | 2 +-
ltfatpy/tests/gabor/test_gabframediag.py | 2 +-
ltfatpy/tests/gabor/test_gabimagepars.py | 2 +-
ltfatpy/tests/gabor/test_gabphasegrad.py | 2 +-
ltfatpy/tests/gabor/test_gabtight.py | 2 +-
ltfatpy/tests/gabor/test_gabwin.py | 48 +++++++++----------
ltfatpy/tests/gabor/test_idgt.py | 2 +-
ltfatpy/tests/gabor/test_instfreqplot.py | 2 +-
ltfatpy/tests/gabor/test_phaselock.py | 2 +-
ltfatpy/tests/gabor/test_phaseplot.py | 2 +-
ltfatpy/tests/gabor/test_phaseunlock.py | 2 +-
ltfatpy/tests/gabor/test_plotdgt.py | 2 +-
ltfatpy/tests/gabor/test_plotdgtreal.py | 2 +-
ltfatpy/tests/gabor/test_s0norm.py | 2 +-
ltfatpy/tests/gabor/test_sgram.py | 2 +-
ltfatpy/tests/gabor/test_tfplot.py | 2 +-
ltfatpy/tests/signals/test_greasy.py | 2 +-
ltfatpy/tests/signals/test_gspi.py | 2 +-
ltfatpy/tests/signals/test_linus.py | 2 +-
ltfatpy/tests/sigproc/test_fir2long.py | 2 +-
ltfatpy/tests/sigproc/test_firkaiser.py | 2 +-
ltfatpy/tests/sigproc/test_firwin.py | 2 +-
ltfatpy/tests/sigproc/test_groupthresh.py | 2 +-
ltfatpy/tests/sigproc/test_largestn.py | 2 +-
ltfatpy/tests/sigproc/test_largestr.py | 2 +-
ltfatpy/tests/sigproc/test_long2fir.py | 2 +-
ltfatpy/tests/sigproc/test_normalize.py | 2 +-
ltfatpy/tests/sigproc/test_rms.py | 2 +-
ltfatpy/tests/sigproc/test_thresh.py | 2 +-
ltfatpy/tests/tools/test_lcm.py | 2 +-
ltfatpy/tests/tools/test_postpad.py | 2 +-
ltfatpy/tools/lcm.py | 2 +-
ltfatpy/tools/postpad.py | 2 +-
ltfatpy/version.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
148 files changed, 191 insertions(+), 180 deletions(-)
diff --git a/VERSION b/VERSION
index d43ce0d..fcc45f3 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-ltfatpy:1.0.15
+ltfatpy:1.0.16
ltfat:2.1.0
diff --git a/doc/copyright.rst b/doc/copyright.rst
index b5d89c5..ccd6ee2 100644
--- a/doc/copyright.rst
+++ b/doc/copyright.rst
@@ -30,7 +30,7 @@ synthesis.
Version
-------
-* ltfatpy version = 1.0.15
+* ltfatpy version = 1.0.16
* LTFAT version = 2.1.0
Licence
diff --git a/ltfatpy/__init__.py b/ltfatpy/__init__.py
index a9a586a..e2c0d6b 100644
--- a/ltfatpy/__init__.py
+++ b/ltfatpy/__init__.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
@@ -171,4 +171,4 @@ __all__ = ["arg_firwin", "assert_groworder", "assert_sigreshape_post",
"long2fir", "normalize", "rms", "thresh", "lcm", "postpad"]
-__version__ = "1.0.15"
+__version__ = "1.0.16"
diff --git a/ltfatpy/comp/arg_firwin.py b/ltfatpy/comp/arg_firwin.py
index 291083f..5137e33 100644
--- a/ltfatpy/comp/arg_firwin.py
+++ b/ltfatpy/comp/arg_firwin.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/comp/assert_groworder.py b/ltfatpy/comp/assert_groworder.py
index d31b769..ce5770c 100644
--- a/ltfatpy/comp/assert_groworder.py
+++ b/ltfatpy/comp/assert_groworder.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/comp/assert_sigreshape_post.py b/ltfatpy/comp/assert_sigreshape_post.py
index f14b9ed..d0c12c7 100644
--- a/ltfatpy/comp/assert_sigreshape_post.py
+++ b/ltfatpy/comp/assert_sigreshape_post.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/comp/assert_sigreshape_pre.py b/ltfatpy/comp/assert_sigreshape_pre.py
index e579d17..e68c112 100644
--- a/ltfatpy/comp/assert_sigreshape_pre.py
+++ b/ltfatpy/comp/assert_sigreshape_pre.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/comp/comp_dct.pyx b/ltfatpy/comp/comp_dct.pyx
index b895b9e..3680ce9 100644
--- a/ltfatpy/comp/comp_dct.pyx
+++ b/ltfatpy/comp/comp_dct.pyx
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/comp/comp_dst.pyx b/ltfatpy/comp/comp_dst.pyx
index a9ec0ec..0ce98c4 100644
--- a/ltfatpy/comp/comp_dst.pyx
+++ b/ltfatpy/comp/comp_dst.pyx
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/comp/comp_gabdual_long.pyx b/ltfatpy/comp/comp_gabdual_long.pyx
index f902fe4..2d9c0d4 100644
--- a/ltfatpy/comp/comp_gabdual_long.pyx
+++ b/ltfatpy/comp/comp_gabdual_long.pyx
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/comp/comp_gabtight_long.pyx b/ltfatpy/comp/comp_gabtight_long.pyx
index f359e4a..003ccf1 100644
--- a/ltfatpy/comp/comp_gabtight_long.pyx
+++ b/ltfatpy/comp/comp_gabtight_long.pyx
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/comp/comp_hermite.py b/ltfatpy/comp/comp_hermite.py
index 25783ee..39489db 100644
--- a/ltfatpy/comp/comp_hermite.py
+++ b/ltfatpy/comp/comp_hermite.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/comp/comp_hermite_all.py b/ltfatpy/comp/comp_hermite_all.py
index e3f4e1b..1482ef2 100644
--- a/ltfatpy/comp/comp_hermite_all.py
+++ b/ltfatpy/comp/comp_hermite_all.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/comp/comp_isepdgt.pyx b/ltfatpy/comp/comp_isepdgt.pyx
index 3711433..3a7cf1d 100644
--- a/ltfatpy/comp/comp_isepdgt.pyx
+++ b/ltfatpy/comp/comp_isepdgt.pyx
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/comp/comp_isepdgtreal.pyx b/ltfatpy/comp/comp_isepdgtreal.pyx
index 49a7729..1f0cd7c 100644
--- a/ltfatpy/comp/comp_isepdgtreal.pyx
+++ b/ltfatpy/comp/comp_isepdgtreal.pyx
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/comp/comp_pgauss.pyx b/ltfatpy/comp/comp_pgauss.pyx
index 9cd4076..7aec05a 100644
--- a/ltfatpy/comp/comp_pgauss.pyx
+++ b/ltfatpy/comp/comp_pgauss.pyx
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/comp/comp_sepdgt.pyx b/ltfatpy/comp/comp_sepdgt.pyx
index 0192d8c..18e5da4 100644
--- a/ltfatpy/comp/comp_sepdgt.pyx
+++ b/ltfatpy/comp/comp_sepdgt.pyx
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/comp/comp_sepdgtreal.pyx b/ltfatpy/comp/comp_sepdgtreal.pyx
index 613940a..98526c1 100644
--- a/ltfatpy/comp/comp_sepdgtreal.pyx
+++ b/ltfatpy/comp/comp_sepdgtreal.pyx
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/comp/comp_sigreshape_post.py b/ltfatpy/comp/comp_sigreshape_post.py
index 6ffc359..4bcb658 100644
--- a/ltfatpy/comp/comp_sigreshape_post.py
+++ b/ltfatpy/comp/comp_sigreshape_post.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/comp/comp_sigreshape_pre.py b/ltfatpy/comp/comp_sigreshape_pre.py
index cfff6d4..2d684f6 100644
--- a/ltfatpy/comp/comp_sigreshape_pre.py
+++ b/ltfatpy/comp/comp_sigreshape_pre.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/comp/comp_window.py b/ltfatpy/comp/comp_window.py
index e0122a2..6689980 100644
--- a/ltfatpy/comp/comp_window.py
+++ b/ltfatpy/comp/comp_window.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/comp/gabpars_from_windowsignal.py b/ltfatpy/comp/gabpars_from_windowsignal.py
index 5040a0b..1078550 100644
--- a/ltfatpy/comp/gabpars_from_windowsignal.py
+++ b/ltfatpy/comp/gabpars_from_windowsignal.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/comp/ltfat.pxd b/ltfatpy/comp/ltfat.pxd
index f8baefc..d890fed 100644
--- a/ltfatpy/comp/ltfat.pxd
+++ b/ltfatpy/comp/ltfat.pxd
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/fourier/dcti.py b/ltfatpy/fourier/dcti.py
index 4f62457..921fc34 100644
--- a/ltfatpy/fourier/dcti.py
+++ b/ltfatpy/fourier/dcti.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/fourier/dctii.py b/ltfatpy/fourier/dctii.py
index aea17f0..8187759 100644
--- a/ltfatpy/fourier/dctii.py
+++ b/ltfatpy/fourier/dctii.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/fourier/dctiii.py b/ltfatpy/fourier/dctiii.py
index 1752fe2..347fb55 100644
--- a/ltfatpy/fourier/dctiii.py
+++ b/ltfatpy/fourier/dctiii.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/fourier/dctiv.py b/ltfatpy/fourier/dctiv.py
index f7a4e71..c8fcd34 100644
--- a/ltfatpy/fourier/dctiv.py
+++ b/ltfatpy/fourier/dctiv.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/fourier/dft.py b/ltfatpy/fourier/dft.py
index ce83c30..c7cc199 100644
--- a/ltfatpy/fourier/dft.py
+++ b/ltfatpy/fourier/dft.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/fourier/dsti.py b/ltfatpy/fourier/dsti.py
index d611073..ec3c141 100644
--- a/ltfatpy/fourier/dsti.py
+++ b/ltfatpy/fourier/dsti.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/fourier/dstii.py b/ltfatpy/fourier/dstii.py
index 6c40d87..6c71f02 100644
--- a/ltfatpy/fourier/dstii.py
+++ b/ltfatpy/fourier/dstii.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/fourier/dstiii.py b/ltfatpy/fourier/dstiii.py
index 1250444..1401a7f 100644
--- a/ltfatpy/fourier/dstiii.py
+++ b/ltfatpy/fourier/dstiii.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/fourier/dstiv.py b/ltfatpy/fourier/dstiv.py
index 9eec6a7..1394824 100644
--- a/ltfatpy/fourier/dstiv.py
+++ b/ltfatpy/fourier/dstiv.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/fourier/fftindex.py b/ltfatpy/fourier/fftindex.py
index 0977dcf..b26395a 100644
--- a/ltfatpy/fourier/fftindex.py
+++ b/ltfatpy/fourier/fftindex.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/fourier/fftreal.py b/ltfatpy/fourier/fftreal.py
index 13dfbaa..3148e0d 100644
--- a/ltfatpy/fourier/fftreal.py
+++ b/ltfatpy/fourier/fftreal.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/fourier/fftresample.py b/ltfatpy/fourier/fftresample.py
index 880c57c..c871ccd 100644
--- a/ltfatpy/fourier/fftresample.py
+++ b/ltfatpy/fourier/fftresample.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/fourier/idft.py b/ltfatpy/fourier/idft.py
index 3ac122b..bf31c81 100644
--- a/ltfatpy/fourier/idft.py
+++ b/ltfatpy/fourier/idft.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/fourier/ifftreal.py b/ltfatpy/fourier/ifftreal.py
index 5061978..5e0024a 100644
--- a/ltfatpy/fourier/ifftreal.py
+++ b/ltfatpy/fourier/ifftreal.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/fourier/isevenfunction.py b/ltfatpy/fourier/isevenfunction.py
index d64450f..ba15186 100644
--- a/ltfatpy/fourier/isevenfunction.py
+++ b/ltfatpy/fourier/isevenfunction.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/fourier/middlepad.py b/ltfatpy/fourier/middlepad.py
index 85553a0..f72901f 100644
--- a/ltfatpy/fourier/middlepad.py
+++ b/ltfatpy/fourier/middlepad.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/fourier/pderiv.py b/ltfatpy/fourier/pderiv.py
index 840ae77..163227d 100644
--- a/ltfatpy/fourier/pderiv.py
+++ b/ltfatpy/fourier/pderiv.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/fourier/pgauss.py b/ltfatpy/fourier/pgauss.py
index f3f4f90..2cf87b9 100644
--- a/ltfatpy/fourier/pgauss.py
+++ b/ltfatpy/fourier/pgauss.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/fourier/pherm.py b/ltfatpy/fourier/pherm.py
index 5abc2a5..4c8c755 100644
--- a/ltfatpy/fourier/pherm.py
+++ b/ltfatpy/fourier/pherm.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/fourier/psech.py b/ltfatpy/fourier/psech.py
index dc218be..ff375e1 100644
--- a/ltfatpy/fourier/psech.py
+++ b/ltfatpy/fourier/psech.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/gabor/dgt.py b/ltfatpy/gabor/dgt.py
index 05ff507..6f1eabc 100644
--- a/ltfatpy/gabor/dgt.py
+++ b/ltfatpy/gabor/dgt.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/gabor/dgtlength.py b/ltfatpy/gabor/dgtlength.py
index 69bd9ff..cd94b0a 100644
--- a/ltfatpy/gabor/dgtlength.py
+++ b/ltfatpy/gabor/dgtlength.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/gabor/dgtreal.py b/ltfatpy/gabor/dgtreal.py
index b011a29..4a39516 100644
--- a/ltfatpy/gabor/dgtreal.py
+++ b/ltfatpy/gabor/dgtreal.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/gabor/gabdual.py b/ltfatpy/gabor/gabdual.py
index 04624ed..4226709 100644
--- a/ltfatpy/gabor/gabdual.py
+++ b/ltfatpy/gabor/gabdual.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/gabor/gabframediag.py b/ltfatpy/gabor/gabframediag.py
index ed0deb2..4f9f0e9 100644
--- a/ltfatpy/gabor/gabframediag.py
+++ b/ltfatpy/gabor/gabframediag.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/gabor/gabimagepars.py b/ltfatpy/gabor/gabimagepars.py
index db059b7..59242a5 100644
--- a/ltfatpy/gabor/gabimagepars.py
+++ b/ltfatpy/gabor/gabimagepars.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/gabor/gabphasegrad.py b/ltfatpy/gabor/gabphasegrad.py
index e1cdaac..eed5911 100644
--- a/ltfatpy/gabor/gabphasegrad.py
+++ b/ltfatpy/gabor/gabphasegrad.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/gabor/gabtight.py b/ltfatpy/gabor/gabtight.py
index 0b8f3fd..4d4d9d4 100644
--- a/ltfatpy/gabor/gabtight.py
+++ b/ltfatpy/gabor/gabtight.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/gabor/gabwin.py b/ltfatpy/gabor/gabwin.py
index c386097..06566a6 100644
--- a/ltfatpy/gabor/gabwin.py
+++ b/ltfatpy/gabor/gabwin.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/gabor/idgt.py b/ltfatpy/gabor/idgt.py
index 16e0970..cffc0a2 100644
--- a/ltfatpy/gabor/idgt.py
+++ b/ltfatpy/gabor/idgt.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/gabor/idgtreal.py b/ltfatpy/gabor/idgtreal.py
index 23b04dd..25aa6f5 100644
--- a/ltfatpy/gabor/idgtreal.py
+++ b/ltfatpy/gabor/idgtreal.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/gabor/instfreqplot.py b/ltfatpy/gabor/instfreqplot.py
index 10bc965..5498847 100644
--- a/ltfatpy/gabor/instfreqplot.py
+++ b/ltfatpy/gabor/instfreqplot.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/gabor/phaselock.py b/ltfatpy/gabor/phaselock.py
index 1e98356..a3f6d46 100644
--- a/ltfatpy/gabor/phaselock.py
+++ b/ltfatpy/gabor/phaselock.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/gabor/phaseplot.py b/ltfatpy/gabor/phaseplot.py
index 9e1c92d..e539f73 100644
--- a/ltfatpy/gabor/phaseplot.py
+++ b/ltfatpy/gabor/phaseplot.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/gabor/phaseunlock.py b/ltfatpy/gabor/phaseunlock.py
index 79d4ea0..2a70fcd 100644
--- a/ltfatpy/gabor/phaseunlock.py
+++ b/ltfatpy/gabor/phaseunlock.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/gabor/plotdgt.py b/ltfatpy/gabor/plotdgt.py
index d5842dc..e78ab54 100644
--- a/ltfatpy/gabor/plotdgt.py
+++ b/ltfatpy/gabor/plotdgt.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/gabor/plotdgtreal.py b/ltfatpy/gabor/plotdgtreal.py
index a592b70..81400dc 100644
--- a/ltfatpy/gabor/plotdgtreal.py
+++ b/ltfatpy/gabor/plotdgtreal.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/gabor/s0norm.py b/ltfatpy/gabor/s0norm.py
index 7f9e695..5ad43a8 100644
--- a/ltfatpy/gabor/s0norm.py
+++ b/ltfatpy/gabor/s0norm.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/gabor/sgram.py b/ltfatpy/gabor/sgram.py
index ea22503..5ab567d 100644
--- a/ltfatpy/gabor/sgram.py
+++ b/ltfatpy/gabor/sgram.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/gabor/tfplot.py b/ltfatpy/gabor/tfplot.py
index 45574ce..9ea92a4 100644
--- a/ltfatpy/gabor/tfplot.py
+++ b/ltfatpy/gabor/tfplot.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/signals/greasy.py b/ltfatpy/signals/greasy.py
index 718f168..b8230a2 100644
--- a/ltfatpy/signals/greasy.py
+++ b/ltfatpy/signals/greasy.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/signals/gspi.py b/ltfatpy/signals/gspi.py
index cbac670..e83a3a6 100644
--- a/ltfatpy/signals/gspi.py
+++ b/ltfatpy/signals/gspi.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/signals/linus.py b/ltfatpy/signals/linus.py
index 5e32968..9877bd3 100644
--- a/ltfatpy/signals/linus.py
+++ b/ltfatpy/signals/linus.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/sigproc/fir2long.py b/ltfatpy/sigproc/fir2long.py
index 00e40d3..1a4bd33 100644
--- a/ltfatpy/sigproc/fir2long.py
+++ b/ltfatpy/sigproc/fir2long.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/sigproc/firkaiser.py b/ltfatpy/sigproc/firkaiser.py
index 25b6329..2580c27 100644
--- a/ltfatpy/sigproc/firkaiser.py
+++ b/ltfatpy/sigproc/firkaiser.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/sigproc/firwin.py b/ltfatpy/sigproc/firwin.py
index 7bdb48c..93d0d25 100644
--- a/ltfatpy/sigproc/firwin.py
+++ b/ltfatpy/sigproc/firwin.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/sigproc/groupthresh.py b/ltfatpy/sigproc/groupthresh.py
index b224b1a..03081b7 100644
--- a/ltfatpy/sigproc/groupthresh.py
+++ b/ltfatpy/sigproc/groupthresh.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/sigproc/largestn.py b/ltfatpy/sigproc/largestn.py
index 0ca4b5c..f6907f0 100644
--- a/ltfatpy/sigproc/largestn.py
+++ b/ltfatpy/sigproc/largestn.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/sigproc/largestr.py b/ltfatpy/sigproc/largestr.py
index 40580fd..2eb55de 100644
--- a/ltfatpy/sigproc/largestr.py
+++ b/ltfatpy/sigproc/largestr.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/sigproc/long2fir.py b/ltfatpy/sigproc/long2fir.py
index c07d60d..ad2670b 100644
--- a/ltfatpy/sigproc/long2fir.py
+++ b/ltfatpy/sigproc/long2fir.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/sigproc/normalize.py b/ltfatpy/sigproc/normalize.py
index 19efcbe..1cf55fc 100644
--- a/ltfatpy/sigproc/normalize.py
+++ b/ltfatpy/sigproc/normalize.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/sigproc/rms.py b/ltfatpy/sigproc/rms.py
index 8e9a0af..a1ef1fb 100644
--- a/ltfatpy/sigproc/rms.py
+++ b/ltfatpy/sigproc/rms.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/sigproc/thresh.py b/ltfatpy/sigproc/thresh.py
index 53979bd..68feec1 100644
--- a/ltfatpy/sigproc/thresh.py
+++ b/ltfatpy/sigproc/thresh.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/comp/test_assert_sigreshape_post.py b/ltfatpy/tests/comp/test_assert_sigreshape_post.py
index fa58619..27020e6 100644
--- a/ltfatpy/tests/comp/test_assert_sigreshape_post.py
+++ b/ltfatpy/tests/comp/test_assert_sigreshape_post.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/comp/test_assert_sigreshape_pre.py b/ltfatpy/tests/comp/test_assert_sigreshape_pre.py
index cd8429e..4acddc4 100644
--- a/ltfatpy/tests/comp/test_assert_sigreshape_pre.py
+++ b/ltfatpy/tests/comp/test_assert_sigreshape_pre.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/comp/test_comp_dct.py b/ltfatpy/tests/comp/test_comp_dct.py
index fabd4b4..8173dd6 100644
--- a/ltfatpy/tests/comp/test_comp_dct.py
+++ b/ltfatpy/tests/comp/test_comp_dct.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/comp/test_comp_dst.py b/ltfatpy/tests/comp/test_comp_dst.py
index 9716412..fdddfbb 100644
--- a/ltfatpy/tests/comp/test_comp_dst.py
+++ b/ltfatpy/tests/comp/test_comp_dst.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/comp/test_comp_gabdual.py b/ltfatpy/tests/comp/test_comp_gabdual.py
index a3528d5..0669803 100644
--- a/ltfatpy/tests/comp/test_comp_gabdual.py
+++ b/ltfatpy/tests/comp/test_comp_gabdual.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
@@ -80,12 +80,16 @@ class TestCompGabDual(unittest.TestCase):
# g should be float64 or complex128
g = np.arange(9)
mess = "g data should be numpy.float64 or numpy.complex128"
- self.assertRaisesRegexp(TypeError, mess, comp_gabdual_long, g, 0, 0)
+ try:
+ assertRaisesRegex = self.assertRaisesRegex
+ except AttributeError:
+ assertRaisesRegex = self.assertRaisesRegexp
+ assertRaisesRegex(TypeError, mess, comp_gabdual_long, g, 0, 0)
g = g.astype(np.float64)
# g dim should be < 3
mess = "g dimensions should be 1 or 2."
- self.assertRaisesRegexp(TypeError, mess, comp_gabdual_long,
- g.reshape((3, 1, 3)), 0, 0)
+ assertRaisesRegex(
+ TypeError, mess, comp_gabdual_long, g.reshape((3, 1, 3)), 0, 0)
# basic test:
g.resize((3, 3))
gd = comp_gabdual_long(g, 1, 1)
diff --git a/ltfatpy/tests/comp/test_comp_hermite.py b/ltfatpy/tests/comp/test_comp_hermite.py
index c4ef5d4..682d78f 100644
--- a/ltfatpy/tests/comp/test_comp_hermite.py
+++ b/ltfatpy/tests/comp/test_comp_hermite.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/comp/test_comp_hermite_all.py b/ltfatpy/tests/comp/test_comp_hermite_all.py
index 8cf2738..d759ee1 100644
--- a/ltfatpy/tests/comp/test_comp_hermite_all.py
+++ b/ltfatpy/tests/comp/test_comp_hermite_all.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/comp/test_comp_isepdgt.py b/ltfatpy/tests/comp/test_comp_isepdgt.py
index ae8f559..df1e4d3 100644
--- a/ltfatpy/tests/comp/test_comp_isepdgt.py
+++ b/ltfatpy/tests/comp/test_comp_isepdgt.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/comp/test_comp_pgauss.py b/ltfatpy/tests/comp/test_comp_pgauss.py
index bc10a2d..9ede0c5 100644
--- a/ltfatpy/tests/comp/test_comp_pgauss.py
+++ b/ltfatpy/tests/comp/test_comp_pgauss.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/comp/test_comp_sepdgt.py b/ltfatpy/tests/comp/test_comp_sepdgt.py
index ffd47f2..0514faf 100644
--- a/ltfatpy/tests/comp/test_comp_sepdgt.py
+++ b/ltfatpy/tests/comp/test_comp_sepdgt.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/comp/test_comp_sigreshape.py b/ltfatpy/tests/comp/test_comp_sigreshape.py
index 6d0196c..63fa1ea 100644
--- a/ltfatpy/tests/comp/test_comp_sigreshape.py
+++ b/ltfatpy/tests/comp/test_comp_sigreshape.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/datasets/get_dataset_path.py b/ltfatpy/tests/datasets/get_dataset_path.py
index 2f560d4..024bff1 100644
--- a/ltfatpy/tests/datasets/get_dataset_path.py
+++ b/ltfatpy/tests/datasets/get_dataset_path.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/datasets/read_comp_dct_signal_ex_mat.py b/ltfatpy/tests/datasets/read_comp_dct_signal_ex_mat.py
index 8a0c3f8..a170746 100644
--- a/ltfatpy/tests/datasets/read_comp_dct_signal_ex_mat.py
+++ b/ltfatpy/tests/datasets/read_comp_dct_signal_ex_mat.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/datasets/read_comp_dst_signal_ex_mat.py b/ltfatpy/tests/datasets/read_comp_dst_signal_ex_mat.py
index 2915391..4306ebd 100644
--- a/ltfatpy/tests/datasets/read_comp_dst_signal_ex_mat.py
+++ b/ltfatpy/tests/datasets/read_comp_dst_signal_ex_mat.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/datasets/read_dgt_signal_ex_mat.py b/ltfatpy/tests/datasets/read_dgt_signal_ex_mat.py
index 24864b0..77ee32b 100644
--- a/ltfatpy/tests/datasets/read_dgt_signal_ex_mat.py
+++ b/ltfatpy/tests/datasets/read_dgt_signal_ex_mat.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/datasets/read_gabframediag_signal_ex_mat.py b/ltfatpy/tests/datasets/read_gabframediag_signal_ex_mat.py
index 2c344b3..270c1fb 100644
--- a/ltfatpy/tests/datasets/read_gabframediag_signal_ex_mat.py
+++ b/ltfatpy/tests/datasets/read_gabframediag_signal_ex_mat.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/datasets/read_gabtight_signal_ex_mat.py b/ltfatpy/tests/datasets/read_gabtight_signal_ex_mat.py
index 2df458e..69feb47 100644
--- a/ltfatpy/tests/datasets/read_gabtight_signal_ex_mat.py
+++ b/ltfatpy/tests/datasets/read_gabtight_signal_ex_mat.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/datasets/read_ref_mat.py b/ltfatpy/tests/datasets/read_ref_mat.py
index 415101e..528f867 100644
--- a/ltfatpy/tests/datasets/read_ref_mat.py
+++ b/ltfatpy/tests/datasets/read_ref_mat.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/datasets/read_s0norm_ex_mat.py b/ltfatpy/tests/datasets/read_s0norm_ex_mat.py
index 2e8a818..a66b4d5 100644
--- a/ltfatpy/tests/datasets/read_s0norm_ex_mat.py
+++ b/ltfatpy/tests/datasets/read_s0norm_ex_mat.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/datasets/test_read_dgt_signal_ext.py b/ltfatpy/tests/datasets/test_read_dgt_signal_ext.py
index b59ab0b..cae0111 100644
--- a/ltfatpy/tests/datasets/test_read_dgt_signal_ext.py
+++ b/ltfatpy/tests/datasets/test_read_dgt_signal_ext.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
@@ -62,9 +62,16 @@
from __future__ import print_function, division
import unittest
-from ltfatpy.tests.datasets.read_dgt_signal_ex_mat import DgtSignals
import numpy
-import fractions
+try:
+ from math import gcd
+except ImportError:
+ # fractions.gcd() is deprecated since Python 3.5 and math.gcd() should be
+ # used instead, but for backward compatibilty we use fractions.gcd() if
+ # math.gcd() is not available
+ from fractions import gcd
+
+from ltfatpy.tests.datasets.read_dgt_signal_ex_mat import DgtSignals
from ltfatpy.tests.datasets.get_dataset_path import get_dataset_path
@@ -107,7 +114,7 @@ class TestReadDgtSignalExt(unittest.TestCase):
if (gl == M):
assert DUAL_WINDOW.size == gl
elif (a != M):
- assert DUAL_WINDOW.size == a * M // fractions.gcd(a, M)
+ assert DUAL_WINDOW.size == a * M // gcd(a, M)
else:
assert DUAL_WINDOW.size == a * 2
diff --git a/ltfatpy/tests/datasets/test_read_ref_mat.py b/ltfatpy/tests/datasets/test_read_ref_mat.py
index 97a1daf..8791607 100644
--- a/ltfatpy/tests/datasets/test_read_ref_mat.py
+++ b/ltfatpy/tests/datasets/test_read_ref_mat.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/fourier/test_dct.py b/ltfatpy/tests/fourier/test_dct.py
index 6af2ab9..d50fe15 100644
--- a/ltfatpy/tests/fourier/test_dct.py
+++ b/ltfatpy/tests/fourier/test_dct.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/fourier/test_dft.py b/ltfatpy/tests/fourier/test_dft.py
index 5ee5abc..e3360aa 100644
--- a/ltfatpy/tests/fourier/test_dft.py
+++ b/ltfatpy/tests/fourier/test_dft.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/fourier/test_dst.py b/ltfatpy/tests/fourier/test_dst.py
index faca2d7..588c4b0 100644
--- a/ltfatpy/tests/fourier/test_dst.py
+++ b/ltfatpy/tests/fourier/test_dst.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/fourier/test_fftindex.py b/ltfatpy/tests/fourier/test_fftindex.py
index a2db268..1e3d889 100644
--- a/ltfatpy/tests/fourier/test_fftindex.py
+++ b/ltfatpy/tests/fourier/test_fftindex.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/fourier/test_fftreal.py b/ltfatpy/tests/fourier/test_fftreal.py
index d9f3a03..e60e62b 100644
--- a/ltfatpy/tests/fourier/test_fftreal.py
+++ b/ltfatpy/tests/fourier/test_fftreal.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/fourier/test_fftresample.py b/ltfatpy/tests/fourier/test_fftresample.py
index e140cb5..422cd09 100644
--- a/ltfatpy/tests/fourier/test_fftresample.py
+++ b/ltfatpy/tests/fourier/test_fftresample.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/fourier/test_idft.py b/ltfatpy/tests/fourier/test_idft.py
index ae3e920..e75fbfb 100644
--- a/ltfatpy/tests/fourier/test_idft.py
+++ b/ltfatpy/tests/fourier/test_idft.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/fourier/test_ifftreal.py b/ltfatpy/tests/fourier/test_ifftreal.py
index 1e117d1..e8102e4 100644
--- a/ltfatpy/tests/fourier/test_ifftreal.py
+++ b/ltfatpy/tests/fourier/test_ifftreal.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/fourier/test_isevenfunction.py b/ltfatpy/tests/fourier/test_isevenfunction.py
index e0bc3ea..8d2c60e 100644
--- a/ltfatpy/tests/fourier/test_isevenfunction.py
+++ b/ltfatpy/tests/fourier/test_isevenfunction.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/fourier/test_middlepad.py b/ltfatpy/tests/fourier/test_middlepad.py
index d8d7e04..98bd65e 100644
--- a/ltfatpy/tests/fourier/test_middlepad.py
+++ b/ltfatpy/tests/fourier/test_middlepad.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/fourier/test_pderiv.py b/ltfatpy/tests/fourier/test_pderiv.py
index 1adb458..8a40721 100644
--- a/ltfatpy/tests/fourier/test_pderiv.py
+++ b/ltfatpy/tests/fourier/test_pderiv.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/fourier/test_pgauss.py b/ltfatpy/tests/fourier/test_pgauss.py
index 03d0ab7..ea133be 100644
--- a/ltfatpy/tests/fourier/test_pgauss.py
+++ b/ltfatpy/tests/fourier/test_pgauss.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/fourier/test_pherm.py b/ltfatpy/tests/fourier/test_pherm.py
index 55845a5..6f621d6 100644
--- a/ltfatpy/tests/fourier/test_pherm.py
+++ b/ltfatpy/tests/fourier/test_pherm.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/fourier/test_psech.py b/ltfatpy/tests/fourier/test_psech.py
index 5ef31bc..8311977 100644
--- a/ltfatpy/tests/fourier/test_psech.py
+++ b/ltfatpy/tests/fourier/test_psech.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
@@ -89,8 +89,8 @@ class TestPsech(unittest.TestCase):
mess += "psech(10.2)\n"
self.assertRaises(TypeError, psech, 10.2, mess)
mess = "\nException TypeError should be raised with declaration "
- mess += "psech(10,(1,1))\n"
- self.assertRaises(TypeError, psech, 10, (1, 1))
+ mess += "psech(10, s=(1,1))\n"
+ self.assertRaises(TypeError, psech, 10, s=(1, 1))
def test_invariance_property(self):
g = psech(self.L)[0]
diff --git a/ltfatpy/tests/gabor/test_dgt.py b/ltfatpy/tests/gabor/test_dgt.py
index 2c89f5f..d388b57 100644
--- a/ltfatpy/tests/gabor/test_dgt.py
+++ b/ltfatpy/tests/gabor/test_dgt.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/gabor/test_gabdual.py b/ltfatpy/tests/gabor/test_gabdual.py
index 76101de..732cf8b 100644
--- a/ltfatpy/tests/gabor/test_gabdual.py
+++ b/ltfatpy/tests/gabor/test_gabdual.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/gabor/test_gabframediag.py b/ltfatpy/tests/gabor/test_gabframediag.py
index 34cc486..572d4b0 100644
--- a/ltfatpy/tests/gabor/test_gabframediag.py
+++ b/ltfatpy/tests/gabor/test_gabframediag.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/gabor/test_gabimagepars.py b/ltfatpy/tests/gabor/test_gabimagepars.py
index 22eee6b..c4e3ace 100644
--- a/ltfatpy/tests/gabor/test_gabimagepars.py
+++ b/ltfatpy/tests/gabor/test_gabimagepars.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/gabor/test_gabphasegrad.py b/ltfatpy/tests/gabor/test_gabphasegrad.py
index dfd531a..0c5e19b 100644
--- a/ltfatpy/tests/gabor/test_gabphasegrad.py
+++ b/ltfatpy/tests/gabor/test_gabphasegrad.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/gabor/test_gabtight.py b/ltfatpy/tests/gabor/test_gabtight.py
index 4198394..689486d 100644
--- a/ltfatpy/tests/gabor/test_gabtight.py
+++ b/ltfatpy/tests/gabor/test_gabtight.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/gabor/test_gabwin.py b/ltfatpy/tests/gabor/test_gabwin.py
index 1899542..18cfe6e 100644
--- a/ltfatpy/tests/gabor/test_gabwin.py
+++ b/ltfatpy/tests/gabor/test_gabwin.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
@@ -106,8 +106,8 @@ class TestGabWin(unittest.TestCase):
self.assertFalse(info['isdual'], mess)
self.assertFalse(info['wasrow'], mess)
self.assertFalse(info['isfir'], mess)
- self.assertEquals(info["tfr"], a*M/L, mess)
- self.assertEquals(info["gl"], len(g), mess)
+ self.assertEqual(info["tfr"], a*M/L, mess)
+ self.assertEqual(info["gl"], len(g), mess)
gt = pgauss(L, a*M/L)[0]
mess += "\ngt = " + str(gt)
np.testing.assert_array_almost_equal(g, gt, 10, mess)
@@ -128,8 +128,8 @@ class TestGabWin(unittest.TestCase):
self.assertFalse(info['isdual'], mess)
self.assertFalse(info['wasrow'], mess)
self.assertFalse(info['isfir'], mess)
- self.assertEquals(info["tfr"], a*M/L, mess)
- self.assertEquals(info["gl"], len(g), mess)
+ self.assertEqual(info["tfr"], a*M/L, mess)
+ self.assertEqual(info["gl"], len(g), mess)
gt = psech(L, a*M/L)[0]
mess += "\ngt = " + str(gt)
np.testing.assert_array_almost_equal(g, gt, 10, mess)
@@ -146,8 +146,8 @@ class TestGabWin(unittest.TestCase):
self.assertTrue(info['isdual'], mess)
self.assertFalse(info['wasrow'], mess)
self.assertFalse(info['isfir'], mess)
- self.assertEquals(info["tfr"], a*M/L, mess)
- self.assertEquals(info["gl"], len(g), mess)
+ self.assertEqual(info["tfr"], a*M/L, mess)
+ self.assertEqual(info["gl"], len(g), mess)
gt = gabdual(pgauss(L, a*M/L)[0], a, M)
mess += "\ngt = " + str(gt)
np.testing.assert_array_almost_equal(g, gt, 10, mess)
@@ -165,8 +165,8 @@ class TestGabWin(unittest.TestCase):
self.assertFalse(info['isdual'], mess)
self.assertFalse(info['wasrow'], mess)
self.assertFalse(info['isfir'], mess)
- self.assertEquals(info["tfr"], a*M/L, mess)
- self.assertEquals(info["gl"], len(g), mess)
+ self.assertEqual(info["tfr"], a*M/L, mess)
+ self.assertEqual(info["gl"], len(g), mess)
gt = gabtight(None, a, M, L)
mess += "\ngt = " + str(gt)
np.testing.assert_array_almost_equal(g, gt, 10, mess)
@@ -189,7 +189,7 @@ class TestGabWin(unittest.TestCase):
self.assertFalse(info['isdual'], mess)
self.assertFalse(info['wasrow'], mess)
self.assertTrue(info['isfir'], mess)
- self.assertEquals(info["gl"], len(g), mess)
+ self.assertEqual(info["gl"], len(g), mess)
gt = firwin(name, M, norm='2')[0]
mess += "\ngt = " + str(gt)
np.testing.assert_array_almost_equal(g, gt, 10, mess)
@@ -216,8 +216,8 @@ class TestGabWin(unittest.TestCase):
self.assertFalse(info['isdual'], mess)
self.assertFalse(info['wasrow'], mess)
self.assertFalse(info['isfir'], mess)
- self.assertEquals(info["tfr"], a*M/L, mess)
- self.assertEquals(info["gl"], len(g), mess)
+ self.assertEqual(info["tfr"], a*M/L, mess)
+ self.assertEqual(info["gl"], len(g), mess)
gt = pgauss(L, a*M/L)[0]
mess += "\ngt = " + str(gt)
np.testing.assert_array_almost_equal(g, gt, 10, mess)
@@ -227,7 +227,7 @@ class TestGabWin(unittest.TestCase):
mess = "a = {0:d}, M = {1:d}, L = {2:d}".format(a, M, L)
mess += "\ng = " + str(g)
mess += "\ninfo = " + str(info)
- self.assertEquals(info["tfr"], 1, mess)
+ self.assertEqual(info["tfr"], 1, mess)
gt = pgauss(L)[0]
mess += "\ngt = " + str(gt)
np.testing.assert_array_almost_equal(g, gt, 10, mess)
@@ -243,8 +243,8 @@ class TestGabWin(unittest.TestCase):
self.assertFalse(info['isdual'], mess)
self.assertFalse(info['wasrow'], mess)
self.assertFalse(info['isfir'], mess)
- self.assertEquals(info["tfr"], a*M/L, mess)
- self.assertEquals(info["gl"], len(g), mess)
+ self.assertEqual(info["tfr"], a*M/L, mess)
+ self.assertEqual(info["gl"], len(g), mess)
gt = psech(L, a*M/L)[0]
mess += "\ngt = " + str(gt)
np.testing.assert_array_almost_equal(g, gt, 10, mess)
@@ -254,7 +254,7 @@ class TestGabWin(unittest.TestCase):
mess = "a = {0:d}, M = {1:d}, L = {2:d}".format(a, M, L)
mess += "\ng = " + str(g)
mess += "\ninfo = " + str(info)
- self.assertEquals(info["tfr"], 1, mess)
+ self.assertEqual(info["tfr"], 1, mess)
gt = psech(L)[0]
mess += "\ngt = " + str(gt)
np.testing.assert_array_almost_equal(g, gt, 10, mess)
@@ -293,7 +293,7 @@ class TestGabWin(unittest.TestCase):
self.assertFalse(info['isdual'], mess)
self.assertFalse(info['wasrow'], mess)
self.assertTrue(info['isfir'], mess)
- self.assertEquals(info["gl"], len(gl), mess)
+ self.assertEqual(info["gl"], len(gl), mess)
gt = firwin(name, Ml, norm='2')[0]
gt = fir2long(gt, int(np.ceil(gt.shape[0] / M) * M))
mess += "\ngt = " + str(gt)
@@ -324,8 +324,8 @@ class TestGabWin(unittest.TestCase):
self.assertTrue(info['isdual'], mess)
self.assertFalse(info['wasrow'], mess)
self.assertFalse(info['isfir'], mess)
- self.assertEquals(info['auxinfo']["tfr"], tfr, mess)
- self.assertEquals(info["gl"], len(g), mess)
+ self.assertEqual(info['auxinfo']["tfr"], tfr, mess)
+ self.assertEqual(info["gl"], len(g), mess)
gt = gabdual(psech(L, tfr)[0], a, M, L)
mess += "\ngt = " + str(gt)
np.testing.assert_array_almost_equal(g, gt, 10, mess)
@@ -345,8 +345,8 @@ class TestGabWin(unittest.TestCase):
self.assertTrue(info['isdual'], mess)
self.assertFalse(info['wasrow'], mess)
self.assertFalse(info['isfir'], mess)
- self.assertEquals(info['auxinfo']["tfr"], tfr, mess)
- self.assertEquals(info["gl"], len(g), mess)
+ self.assertEqual(info['auxinfo']["tfr"], tfr, mess)
+ self.assertEqual(info["gl"], len(g), mess)
gt = gabdual(pgauss(L, tfr)[0], a, M, L)
mess += "\ngt = " + str(gt)
np.testing.assert_array_almost_equal(g, gt, 10, mess)
@@ -365,7 +365,7 @@ class TestGabWin(unittest.TestCase):
self.assertTrue(info['isdual'], mess)
self.assertFalse(info['wasrow'], mess)
self.assertTrue(info['isfir'], mess)
- self.assertEquals(info["gl"], len(g), mess)
+ self.assertEqual(info["gl"], len(g), mess)
gt = firwin(name, M, norm='2')[0]
gt = gabdual(gt, a, M, L)
mess += "\ngt = " + str(gt)
@@ -384,7 +384,7 @@ class TestGabWin(unittest.TestCase):
self.assertFalse(info['isdual'], mess)
self.assertFalse(info['wasrow'], mess)
self.assertTrue(info['isfir'], mess)
- self.assertEquals(info["gl"], len(g), mess)
+ self.assertEqual(info["gl"], len(g), mess)
gt = firwin(name, M, norm='2')[0]
gt = gabtight(gt, a, M, L)
mess += "\ngt = " + str(gt)
@@ -403,7 +403,7 @@ class TestGabWin(unittest.TestCase):
self.assertFalse(info['isdual'], mess)
self.assertTrue(info['wasrow'], mess)
self.assertFalse(info['isfir'], mess)
- self.assertEquals(info["gl"], L, mess)
+ self.assertEqual(info["gl"], L, mess)
gt = pgauss(L)[0]
mess += "\ngt = " + str(gt)
np.testing.assert_array_almost_equal(g, gt, 10, mess)
diff --git a/ltfatpy/tests/gabor/test_idgt.py b/ltfatpy/tests/gabor/test_idgt.py
index 5562f3a..39bfe14 100644
--- a/ltfatpy/tests/gabor/test_idgt.py
+++ b/ltfatpy/tests/gabor/test_idgt.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/gabor/test_instfreqplot.py b/ltfatpy/tests/gabor/test_instfreqplot.py
index 0d8c970..7c91585 100644
--- a/ltfatpy/tests/gabor/test_instfreqplot.py
+++ b/ltfatpy/tests/gabor/test_instfreqplot.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/gabor/test_phaselock.py b/ltfatpy/tests/gabor/test_phaselock.py
index 23aae72..2b36fe4 100644
--- a/ltfatpy/tests/gabor/test_phaselock.py
+++ b/ltfatpy/tests/gabor/test_phaselock.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/gabor/test_phaseplot.py b/ltfatpy/tests/gabor/test_phaseplot.py
index 031ac8e..b6b7cf8 100644
--- a/ltfatpy/tests/gabor/test_phaseplot.py
+++ b/ltfatpy/tests/gabor/test_phaseplot.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/gabor/test_phaseunlock.py b/ltfatpy/tests/gabor/test_phaseunlock.py
index f0b10cd..634c794 100644
--- a/ltfatpy/tests/gabor/test_phaseunlock.py
+++ b/ltfatpy/tests/gabor/test_phaseunlock.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/gabor/test_plotdgt.py b/ltfatpy/tests/gabor/test_plotdgt.py
index 2eec602..ded646b 100644
--- a/ltfatpy/tests/gabor/test_plotdgt.py
+++ b/ltfatpy/tests/gabor/test_plotdgt.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/gabor/test_plotdgtreal.py b/ltfatpy/tests/gabor/test_plotdgtreal.py
index 0059187..8060a92 100644
--- a/ltfatpy/tests/gabor/test_plotdgtreal.py
+++ b/ltfatpy/tests/gabor/test_plotdgtreal.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/gabor/test_s0norm.py b/ltfatpy/tests/gabor/test_s0norm.py
index 7be9973..0e16229 100644
--- a/ltfatpy/tests/gabor/test_s0norm.py
+++ b/ltfatpy/tests/gabor/test_s0norm.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/gabor/test_sgram.py b/ltfatpy/tests/gabor/test_sgram.py
index 6531718..f04ce16 100644
--- a/ltfatpy/tests/gabor/test_sgram.py
+++ b/ltfatpy/tests/gabor/test_sgram.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/gabor/test_tfplot.py b/ltfatpy/tests/gabor/test_tfplot.py
index 2771586..99c5d98 100644
--- a/ltfatpy/tests/gabor/test_tfplot.py
+++ b/ltfatpy/tests/gabor/test_tfplot.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/signals/test_greasy.py b/ltfatpy/tests/signals/test_greasy.py
index eac2b45..4d2ab68 100644
--- a/ltfatpy/tests/signals/test_greasy.py
+++ b/ltfatpy/tests/signals/test_greasy.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/signals/test_gspi.py b/ltfatpy/tests/signals/test_gspi.py
index 7a959c2..603e5c1 100644
--- a/ltfatpy/tests/signals/test_gspi.py
+++ b/ltfatpy/tests/signals/test_gspi.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/signals/test_linus.py b/ltfatpy/tests/signals/test_linus.py
index fc9f768..6b03401 100644
--- a/ltfatpy/tests/signals/test_linus.py
+++ b/ltfatpy/tests/signals/test_linus.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/sigproc/test_fir2long.py b/ltfatpy/tests/sigproc/test_fir2long.py
index 393b191..5e0aa90 100644
--- a/ltfatpy/tests/sigproc/test_fir2long.py
+++ b/ltfatpy/tests/sigproc/test_fir2long.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/sigproc/test_firkaiser.py b/ltfatpy/tests/sigproc/test_firkaiser.py
index 08b5b16..279b710 100644
--- a/ltfatpy/tests/sigproc/test_firkaiser.py
+++ b/ltfatpy/tests/sigproc/test_firkaiser.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/sigproc/test_firwin.py b/ltfatpy/tests/sigproc/test_firwin.py
index 842f109..9f0954a 100644
--- a/ltfatpy/tests/sigproc/test_firwin.py
+++ b/ltfatpy/tests/sigproc/test_firwin.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/sigproc/test_groupthresh.py b/ltfatpy/tests/sigproc/test_groupthresh.py
index 47d3087..86a9241 100644
--- a/ltfatpy/tests/sigproc/test_groupthresh.py
+++ b/ltfatpy/tests/sigproc/test_groupthresh.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/sigproc/test_largestn.py b/ltfatpy/tests/sigproc/test_largestn.py
index f90c211..a02f3ea 100644
--- a/ltfatpy/tests/sigproc/test_largestn.py
+++ b/ltfatpy/tests/sigproc/test_largestn.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/sigproc/test_largestr.py b/ltfatpy/tests/sigproc/test_largestr.py
index 70f1212..e2e5d91 100644
--- a/ltfatpy/tests/sigproc/test_largestr.py
+++ b/ltfatpy/tests/sigproc/test_largestr.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/sigproc/test_long2fir.py b/ltfatpy/tests/sigproc/test_long2fir.py
index 79d9d2e..5319f89 100644
--- a/ltfatpy/tests/sigproc/test_long2fir.py
+++ b/ltfatpy/tests/sigproc/test_long2fir.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/sigproc/test_normalize.py b/ltfatpy/tests/sigproc/test_normalize.py
index a0bc5d3..84f737b 100644
--- a/ltfatpy/tests/sigproc/test_normalize.py
+++ b/ltfatpy/tests/sigproc/test_normalize.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/sigproc/test_rms.py b/ltfatpy/tests/sigproc/test_rms.py
index 206bd62..b926afb 100644
--- a/ltfatpy/tests/sigproc/test_rms.py
+++ b/ltfatpy/tests/sigproc/test_rms.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/sigproc/test_thresh.py b/ltfatpy/tests/sigproc/test_thresh.py
index 5c67116..1e7bb71 100644
--- a/ltfatpy/tests/sigproc/test_thresh.py
+++ b/ltfatpy/tests/sigproc/test_thresh.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/tools/test_lcm.py b/ltfatpy/tests/tools/test_lcm.py
index 7f50a0d..cb9e455 100644
--- a/ltfatpy/tests/tools/test_lcm.py
+++ b/ltfatpy/tests/tools/test_lcm.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tests/tools/test_postpad.py b/ltfatpy/tests/tools/test_postpad.py
index 56c902e..2b24670 100644
--- a/ltfatpy/tests/tools/test_postpad.py
+++ b/ltfatpy/tests/tools/test_postpad.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tools/lcm.py b/ltfatpy/tools/lcm.py
index 515f1f4..5eb1c32 100644
--- a/ltfatpy/tools/lcm.py
+++ b/ltfatpy/tools/lcm.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/tools/postpad.py b/ltfatpy/tools/postpad.py
index 2daa889..2b17ce1 100644
--- a/ltfatpy/tools/postpad.py
+++ b/ltfatpy/tools/postpad.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/ltfatpy/version.py b/ltfatpy/version.py
index 5eb154a..f307bae 100644
--- a/ltfatpy/version.py
+++ b/ltfatpy/version.py
@@ -32,7 +32,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
diff --git a/setup.cfg b/setup.cfg
index d694e8c..acc5ee1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,7 +8,7 @@ cover-erase = 1
cover-html = 1
cover-html-dir = ../build/htmlcov
-[pytest]
+[tool:pytest]
# Specifies a minimal pytest version required for running tests.
minversion = 2.6
# Specifies the options
diff --git a/setup.py b/setup.py
index 4911729..92794f2 100755
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@
# Version
# -------
#
-# * ltfatpy version = 1.0.15
+# * ltfatpy version = 1.0.16
# * LTFAT version = 2.1.0
#
# Licence
--
GitLab