run isort

Author: eriknw

setup.cfg

@@ -35,3 +35,10 @@ parentdir_prefix=suitesparse_graphblas-
 [tool:pytest]
 testpaths = suitesparse_graphblas/tests
 
+[isort]
+sections = FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
+profile = black
+skip_gitignore = true
+float_to_top = true
+default_section = THIRDPARTY
+known_first_party = suitesparse_graphblas

setup.py

@@ -1,17 +1,20 @@
-from setuptools import setup, find_packages, Extension
+import os
+import sys
 from glob import glob
 
+import numpy as np
+from setuptools import Extension, find_packages, setup
+
+import versioneer
+
 try:
     from Cython.Build import cythonize
     from Cython.Compiler.Options import get_directive_defaults
 
     use_cython = True
 except ImportError:
     use_cython = False
-import numpy as np
-import os
-import sys
-import versioneer
+
 
 is_win = sys.platform.startswith("win")
 define_macros = [("NPY_NO_DEPRECATED_API", "NPY_1_7_API_VERSION")]

suitesparse_graphblas/__init__.py

@@ -1,7 +1,7 @@
-from ._graphblas import ffi, lib  # noqa
+from . import exceptions as ex
 from . import utils
+from ._graphblas import ffi, lib  # noqa
 from ._version import get_versions
-from . import exceptions as ex
 
 
 def is_initialized():

suitesparse_graphblas/build.py

@@ -1,5 +1,6 @@
 import os
 import sys
+
 from cffi import FFI
 
 is_win = sys.platform.startswith("win")

suitesparse_graphblas/create_headers.py

@@ -27,6 +27,7 @@
 import shutil
 import subprocess
 import sys
+
 import pycparser
 from pycparser import c_ast, c_generator, parse_file
 
@@ -579,7 +580,7 @@ def handle_function_node(node):
             group = "matrix"
         elif "GrB_Vector" in text:
             group = "vector"
-        elif "GxB_Scalar" in text:
+        elif "GxB_Scalar" in text or "GrB_Scalar" in text:
             group = "scalar"
         else:
             group = node.name.split("_", 2)[1]
@@ -596,13 +597,15 @@ def handle_function_node(node):
                 "Semiring": "semiring",
                 "Type": "type",
                 "UnaryOp": "unary",
+                "IndexUnaryOp": "indexunary",
                 # "everything else" is "core"
                 "getVersion": "core",
                 "Global": "core",
                 "cuda": "core",
                 "finalize": "core",
                 "init": "core",
                 "wait": "core",
+                "deserialize": "core",
             }[group]
         return {
             "name": node.name,
@@ -807,8 +810,12 @@ def main():
     print("Step 6: check #define definitions")
     with open(graphblas_h) as f:
         text = f.read()
+    define_lines = re.compile(r".*?#define\s+\w+\s+")
     define_pattern = re.compile(r"#define\s+\w+\s+")
-    defines = {x[len("#define") :].strip() for x in define_pattern.findall(text)}
+    defines = set()
+    for line in define_lines.findall(text):
+        line = line.split("//")[0].split("/*")[0]
+        defines.update(x[len("#define") :].strip() for x in define_pattern.findall(line))
     extra_defines = (DEFINES | CHAR_DEFINES) - defines
     if extra_defines:
         # Should this raise?  If it's a problem, it will raise when compiling.

suitesparse_graphblas/io/binary.py

@@ -1,8 +1,9 @@
-from pathlib import Path
 from ctypes.util import find_library
-from suitesparse_graphblas import ffi, lib, check_status, matrix, __version__
+from pathlib import Path
+
 from cffi import FFI
 
+from suitesparse_graphblas import __version__, check_status, ffi, lib, matrix
 
 stdffi = FFI()
 stdffi.cdef(

suitesparse_graphblas/matrix.py

@@ -1,8 +1,4 @@
-from suitesparse_graphblas import (
-    lib,
-    ffi,
-    check_status,
-)
+from suitesparse_graphblas import check_status, ffi, lib
 
 
 def free(A):

suitesparse_graphblas/scalar.py

@@ -1,9 +1,4 @@
-from suitesparse_graphblas import (
-    lib,
-    ffi,
-    check_status,
-    exceptions,
-)
+from suitesparse_graphblas import check_status, exceptions, ffi, lib
 
 
 def free(v):

suitesparse_graphblas/tests/conftest.py

@@ -1,4 +1,5 @@
 import pytest
+
 from suitesparse_graphblas import initialize
 
 

suitesparse_graphblas/tests/test_doctest.py

@@ -1,10 +1,7 @@
 def test_run_doctests():
     import doctest
-    from suitesparse_graphblas import (
-        matrix,
-        vector,
-        scalar,
-    )
+
+    from suitesparse_graphblas import matrix, scalar, vector
 
     for mod in (
         matrix,