Version 1.3.0

Dropped Pyton 2.7 and 3.6
Increased reqs for numpy and scipy due to vulns
Removed dependency on six

.github/workflows/build_and_test.yml

@@ -13,7 +13,7 @@ jobs:
         strategy:
             matrix:
                 os: [ubuntu-latest]
-                python-version: [2.7, 3.7, 3.8, 3.9, "3.10", "3.11"]
+                python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
         steps:
             -   uses: actions/checkout@v3
             -   name: Set up Python ${{ matrix.python-version }}

.github/workflows/pypi-publish.yml

@@ -13,9 +13,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: '3.x'
     - name: Install dependencies

CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.0] - 2023-01-24
+
+### Changed
+
+- Modified test matrix in CI
+
+### Removed
+
+- Support for Python 2.7 and 3.6.
+- Dependency on `six`.
+
+
 ## [1.2.0] - 2022-06-08
 
 ### Added

README.md

@@ -1,7 +1,6 @@
 # LSPOpt
 
 ![Build and Test](https://github.com/hbldh/lspopt/workflows/Build%20and%20Test/badge.svg)
-[![Coverage Status](https://coveralls.io/repos/github/hbldh/lspopt/badge.svg?branch=master)](https://coveralls.io/github/hbldh/lspopt?branch=master)
 [![PyPI version](https://img.shields.io/pypi/v/lspopt.svg)](https://pypi.org/project/lspopt/)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
 
@@ -32,10 +31,9 @@ If you prefer to use `conda`, see [instructions in this repo](https://github.com
 
 Test with `pytest`:
 
-    pytest tests/ 
+    pytest tests/
 
-Tests are run at every commit to GitHub and the results of this, as well as test 
-coverage, can be studied at [Azure Pipelines](https://dev.azure.com/hbldh/github/_build/latest?definitionId=7&branchName=master).
+See test badge at the top of this README for link to test coverage and reports.
 
 ## Usage
 

lspopt/__init__.py

@@ -1,12 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-from __future__ import absolute_import
-
-
 from lspopt.lsp import lspopt, spectrogram_lspopt
 from lspopt.__version__ import __version__, version
 

lspopt/__version__.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-version = "1.2.0"
+version = "1.3.0"
 __version__ = version

lspopt/data/__init__.py

@@ -8,11 +8,6 @@
 
 """
 
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-from __future__ import absolute_import
-
 from pkg_resources import resource_filename
 
 import numpy as np

lspopt/lsp.py

@@ -14,12 +14,6 @@
 
 """
 
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-from __future__ import absolute_import
-
-import six
 import numpy as np
 from scipy.signal import spectrogram
 
@@ -60,7 +54,7 @@ def lspopt(n, c_parameter=20.0):
 
     t1 = np.arange(-(n / 2) + 1, (n / 2) + 0.1, step=1.0) / f_h(n, K)
     h = np.vstack((np.ones((n,)), 2 * t1))
-    for i in six.moves.range(1, K - 1):
+    for i in range(1, K - 1):
         h = np.vstack((h, (2 * t1 * h.T[:, i]) - 2 * i * h.T[:, i - 1]))
 
     H = h.T * np.outer(np.exp(-(t1 ** 2) / 2), np.ones((K,), "float"))

lspopt/utils.py

@@ -14,11 +14,6 @@
 
 """
 
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-from __future__ import absolute_import
-
 import numpy as np
 from scipy.linalg import sqrtm
 

requirements.txt

@@ -1,3 +1,2 @@
-numpy>=1.7.0
-scipy>=0.16.1
-six>=1.10.0
+numpy>=1.21.6
+scipy>=1.7.3

setup.py

@@ -22,13 +22,12 @@
 URL = 'https://github.com/hbldh/lspopt'
 EMAIL = '[email protected]'
 AUTHOR = 'Henrik Blidh'
-REQUIRES_PYTHON = '>=2.7.10'
+REQUIRES_PYTHON = '>=3.7'
 VERSION = None
 
 REQUIRED = [
-    'numpy',
-    'scipy',
-    'six'
+    'numpy>=1.21.6',
+    'scipy>=1.7.3',
 ]
 
 here = os.path.abspath(os.path.dirname(__file__))
@@ -114,12 +113,12 @@ def run(self):
         'Operating System :: POSIX',
         'Operating System :: Unix',
         'Operating System :: MacOS',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy'
     ],

tests/lspopt_ref.py

@@ -14,12 +14,6 @@
 
 """
 
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-from __future__ import absolute_import
-
-import six
 import numpy as np
 
 from lspopt.data import C, WEIGHTS
@@ -73,7 +67,7 @@ def lspopt_ref(n, c_parameter=20.0):
                 h = np.vstack((h, (2 * t1 * h.T[:, i]) - 2 * i * h.T[:, i - 1]))
     H = h.T * np.outer(np.exp(-(t1 ** 2) / 2), np.ones((K,), "float"))
 
-    for i in six.moves.range(K):
+    for i in range(K):
         H[:, i] = H[:, i] / np.sqrt(H[:, i].T.dot(H[:, i]))  # Norm
 
     return H.T, wei

tests/test_implementation.py

@@ -22,7 +22,6 @@
 import unittest
 
 import pytest
-import six
 import numpy as np
 from numpy.testing import assert_allclose
 from scipy.signal import chirp, spectrogram
@@ -31,7 +30,7 @@
 from .lspopt_ref import lspopt_ref
 
 
-@pytest.mark.parametrize("n", six.moves.range(64, 1024))
+@pytest.mark.parametrize("n", range(64, 1024))
 def test_different_n(n):
     """Test against reference implementation for different N."""
     h1, w1 = lspopt(n)

tests/test_utils.py

@@ -20,7 +20,6 @@
 from __future__ import absolute_import
 
 import pytest
-import six
 import numpy as np
 from numpy.testing import assert_allclose