Add isort to pre-commit and add to pyproject.toml

Author: ndgrigorian

.pre-commit-config.yaml

@@ -29,6 +29,18 @@ repos:
         - flake8-docstrings==1.7.0
         - flake8-bugbear==24.4.26
 
+-   repo: https://github.com/pycqa/isort
+    rev: 5.13.2
+    hooks:
+    -   id: isort
+        name: isort (python)
+    -   id: isort
+        name: isort (cython)
+        types: [cython]
+    -   id: isort
+        name: isort (pyi)
+        types: [pyi]
+
 - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
   rev: v2.14.0
   hooks:

_vendored/conv_template.py

@@ -77,8 +77,8 @@
 __all__ = ["process_str", "process_file"]
 
 import os
-import sys
 import re
+import sys
 
 # names for replacement that are already global.
 global_names = {}

mkl_fft/__init__.py

@@ -24,26 +24,26 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import mkl_fft.interfaces
+
 from . import _init_helper
 from ._pydfti import (
     fft,
-    ifft,
     fft2,
-    ifft2,
     fftn,
+    ifft,
+    ifft2,
     ifftn,
-    rfftpack,
+    irfft,
+    irfft2,
+    irfftn,
     irfftpack,
     rfft,
-    irfft,
     rfft2,
-    irfft2,
     rfftn,
-    irfftn,
+    rfftpack,
 )
-
 from ._version import __version__
-import mkl_fft.interfaces
 
 __all__ = [
     "fft",

mkl_fft/_numpy_fft.py

@@ -70,11 +70,12 @@
     "ifftn",
 ]
 
-from numpy import array, asanyarray, conjugate, take, sqrt, prod
+import re
+
+from numpy import array, asanyarray, conjugate, prod, sqrt, take
 
-from . import _pydfti as mkl_fft
 from . import _float_utils
-import re
+from . import _pydfti as mkl_fft
 
 
 def _check_norm(norm):

mkl_fft/_pydfti.pyx

@@ -28,20 +28,23 @@
 
 # imports
 import sys
+
 import numpy as np
+
 if np.lib.NumpyVersion(np.__version__) >= "2.0.0a0":
     from numpy._core._multiarray_tests import internal_overlap
 else:
     from numpy.core._multiarray_tests import internal_overlap
+
 from threading import local as threading_local
 
 # cimports
+
+cimport cpython.pycapsule
 cimport numpy as cnp
+from cpython.exc cimport PyErr_Clear, PyErr_Occurred
+from cpython.mem cimport PyMem_Free, PyMem_Malloc
 from libc.string cimport memcpy
-cimport cpython.pycapsule
-from cpython.exc cimport (PyErr_Occurred, PyErr_Clear)
-from cpython.mem cimport (PyMem_Malloc, PyMem_Free)
-
 
 # thread-local storage
 _tls = threading_local()

mkl_fft/_scipy_fft.py

@@ -24,16 +24,16 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from . import _pydfti as mkl_fft
-from . import _float_utils
-import mkl
-
-from numpy import take, sqrt, prod
-import contextvars
 import contextlib
+import contextvars
 import operator
 import os
 
+import mkl
+from numpy import prod, sqrt, take
+
+from . import _float_utils
+from . import _pydfti as mkl_fft
 
 __doc__ = """
 This module implements interfaces mimicing `scipy.fft` module.

mkl_fft/_scipy_fftpack.py

@@ -24,8 +24,8 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from . import _pydfti as mkl_fft
 from . import _float_utils
+from . import _pydfti as mkl_fft
 
 __all__ = ["fft", "ifft", "fftn", "ifftn", "fft2", "ifft2", "rfft", "irfft"]
 

mkl_fft/interfaces/__init__.py

@@ -23,5 +23,4 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from . import numpy_fft
-from . import scipy_fft
+from . import numpy_fft, scipy_fft

mkl_fft/tests/test_fft1d.py

@@ -25,8 +25,9 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import numpy as np
-from numpy.testing import TestCase, assert_, assert_allclose
 from numpy import random as rnd
+from numpy.testing import TestCase, assert_, assert_allclose
+
 import mkl_fft
 
 

mkl_fft/tests/test_fftnd.py

@@ -25,9 +25,10 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import numpy as np
-from numpy.testing import TestCase, assert_allclose
-from numpy import random as rnd
 import pytest
+from numpy import random as rnd
+from numpy.testing import TestCase, assert_allclose
+
 import mkl_fft
 
 reps_64 = (2**11) * np.finfo(np.float64).eps

mkl_fft/tests/test_interfaces.py

@@ -23,9 +23,10 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import mkl_fft.interfaces as mfi
-import pytest
 import numpy as np
+import pytest
+
+import mkl_fft.interfaces as mfi
 
 
 @pytest.mark.parametrize("norm", [None, "forward", "backward", "ortho"])

mkl_fft/tests/test_pocketfft.py

@@ -1,12 +1,18 @@
 # This file includes tests from numpy.fft module:
 # https://github.com/numpy/numpy/blob/main/numpy/fft/tests/test_pocketfft.py
 
+import queue
+import threading
+
 import numpy as np
 import pytest
 from numpy.random import random
-from numpy.testing import assert_array_equal, assert_raises, assert_allclose, IS_WASM
-import threading
-import queue
+from numpy.testing import (
+    IS_WASM,
+    assert_allclose,
+    assert_array_equal,
+    assert_raises,
+)
 
 import mkl_fft.interfaces.numpy_fft as mkl_fft
 

pyproject.toml

@@ -66,6 +66,15 @@ test = ["pytest"]
 Download = "http://github.com/IntelPython/mkl_fft"
 Homepage = "http://github.com/IntelPython/mkl_fft"
 
+[tool.isort]
+ensure_newline_before_comments = true
+force_grid_wrap = 0
+include_trailing_comma = true
+line_length = 80
+multi_line_output = 3
+skip = []
+use_parentheses = true
+
 [tool.setuptools]
 include-package-data = true
 packages = ["mkl_fft", "mkl_fft.interfaces"]

setup.py

@@ -24,12 +24,13 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import sys
 import os
+import sys
 from os.path import join
+
 import Cython.Build
-from setuptools import setup, Extension
 import numpy as np
+from setuptools import Extension, setup
 
 sys.path.insert(0, os.path.dirname(__file__))  # Ensures local imports work
 from _vendored.conv_template import process_file as process_c_file  # noqa: E402