Merge pull request #57 from casework/add_flake8_and_isort_to_precommit

Add flake8 and isort to precommit

Author: kchason

.pre-commit-config.yaml

@@ -1,5 +1,14 @@
 repos:
--   repo: https://github.com/psf/black
+  - repo: https://github.com/psf/black
     rev: 22.3.0
     hooks:
-    -   id: black
+      - id: black
+  - repo: https://github.com/pycqa/flake8
+    rev: 4.0.1
+    hooks:
+      - id: flake8
+  - repo: https://github.com/pycqa/isort
+    rev: 5.10.1
+    hooks:
+      - id: isort
+        name: isort (python)

case_utils/__init__.py

@@ -13,4 +13,4 @@
 
 __version__ = "0.5.0"
 
-from . import local_uuid
+from . import local_uuid  # noqa: F401

case_utils/case_file/__init__.py

@@ -28,7 +28,14 @@
 import rdflib  # type: ignore
 
 import case_utils
-from case_utils.namespace import *
+from case_utils.namespace import (
+    NS_RDF,
+    NS_UCO_CORE,
+    NS_UCO_OBSERVABLE,
+    NS_UCO_TYPES,
+    NS_UCO_VOCABULARY,
+    NS_XSD,
+)
 
 DEFAULT_PREFIX = "http://example.org/kb/"
 
@@ -147,7 +154,7 @@ def create_file_node(
                     sha1obj.update(buf)
                     sha256obj.update(buf)
                     sha512obj.update(buf)
-            if not stashed_error is None:
+            if stashed_error is not None:
                 raise stashed_error
             current_hashdict = HashDict(
                 byte_tally,
@@ -182,7 +189,7 @@ def create_file_node(
 
         # Add confirmed hashes into graph.
         for key in successful_hashdict._fields:
-            if not key in ("md5", "sha1", "sha256", "sha512"):
+            if key not in ("md5", "sha1", "sha256", "sha512"):
                 continue
             n_hash = rdflib.BNode()
             graph.add((n_contentdata_facet, NS_UCO_OBSERVABLE.hash, n_hash))
@@ -247,7 +254,7 @@ def main() -> None:
         serialize_kwargs["context"] = context_dictionary
 
     node_iri = NS_BASE["file-" + case_utils.local_uuid.local_uuid()]
-    n_file = create_file_node(
+    create_file_node(
         graph,
         args.in_file,
         node_iri=node_iri,

case_utils/case_sparql_construct/__init__.py

@@ -26,8 +26,10 @@
 import rdflib.plugins.sparql  # type: ignore
 
 import case_utils.ontology
-
-from case_utils.ontology.version_info import *
+from case_utils.ontology.version_info import (
+    CURRENT_CASE_VERSION,
+    built_version_choices_list,
+)
 
 _logger = logging.getLogger(os.path.basename(__file__))
 
@@ -81,7 +83,7 @@ def main() -> None:
     construct_query_text = None
     with open(args.in_sparql, "r") as in_fh:
         construct_query_text = in_fh.read().strip()
-    assert not construct_query_text is None
+    assert construct_query_text is not None
 
     if "subClassOf" in construct_query_text:
         case_utils.ontology.load_subclass_hierarchy(

case_utils/case_sparql_select/__init__.py

@@ -30,7 +30,6 @@
 
 import argparse
 import binascii
-import importlib.resources
 import logging
 import os
 import sys
@@ -39,8 +38,10 @@
 import rdflib.plugins.sparql  # type: ignore
 
 import case_utils.ontology
-
-from case_utils.ontology.version_info import *
+from case_utils.ontology.version_info import (
+    CURRENT_CASE_VERSION,
+    built_version_choices_list,
+)
 
 NS_XSD = rdflib.XSD
 

case_utils/case_validate/__init__.py

@@ -35,16 +35,17 @@
 import importlib.resources
 import logging
 import os
-import pathlib
 import sys
 import typing
 
-import rdflib.util  # type: ignore
 import pyshacl  # type: ignore
+import rdflib.util  # type: ignore
 
 import case_utils.ontology
-
-from case_utils.ontology.version_info import *
+from case_utils.ontology.version_info import (
+    CURRENT_CASE_VERSION,
+    built_version_choices_list,
+)
 
 _logger = logging.getLogger(os.path.basename(__file__))
 

case_utils/local_uuid.py

@@ -22,8 +22,8 @@
 import pathlib
 import sys
 import typing
-import warnings
 import uuid
+import warnings
 
 DEMO_UUID_BASE: typing.Optional[str] = None
 

case_utils/ontology/__init__.py

@@ -22,7 +22,7 @@
 # Yes, this next import is self-referential (/circular).  But, it does work with importlib.
 import case_utils.ontology
 
-from .version_info import *
+from .version_info import CURRENT_CASE_VERSION
 
 _logger = logging.getLogger(os.path.basename(__file__))
 

setup.cfg

@@ -37,3 +37,14 @@ console_scripts =
 [options.package_data]
 case_utils = py.typed
 case_utils.ontology = *.ttl
+
+[flake8]
+# https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#flake8
+extend-ignore =
+  E203
+  E302
+  E501
+
+[isort]
+# https://pycqa.github.io/isort/docs/configuration/black_compatibility.html
+profile = black

tests/case_utils/case_file/test_case_file.py

@@ -19,7 +19,7 @@
 import rdflib.plugins.sparql  # type: ignore
 
 import case_utils.ontology
-from case_utils.namespace import *
+from case_utils.namespace import NS_UCO_CORE, NS_UCO_OBSERVABLE, NS_UCO_TYPES
 
 _logger = logging.getLogger(os.path.basename(__file__))
 
@@ -117,12 +117,12 @@ def test_confirm_mtime(
     for result in graph_case_file_disable_hashes.query(query_object):
         (n_observable_object,) = result
     assert (
-        not n_observable_object is None
+        n_observable_object is not None
     ), "File object with expected mtime not found in hashless graph."
 
     n_observable_object = None
     for result in graph_case_file.query(query_object):
         (n_observable_object,) = result
     assert (
-        not n_observable_object is None
+        n_observable_object is not None
     ), "File object with expected mtime not found in fuller graph."