Merge pull request #62 from casework/test_mypy_strict

Test with mypy --strict

Author: kchason

case_utils/case_file/__init__.py

@@ -25,7 +25,7 @@
 import typing
 import warnings
 
-import rdflib  # type: ignore
+import rdflib
 
 import case_utils
 from case_utils.namespace import (

case_utils/case_sparql_construct/__init__.py

@@ -23,7 +23,7 @@
 import sys
 import typing
 
-import rdflib.plugins.sparql  # type: ignore
+import rdflib.plugins.sparql
 
 import case_utils.ontology
 from case_utils.ontology.version_info import (
@@ -90,7 +90,7 @@ def main() -> None:
             in_graph, built_version=args.built_version
         )
 
-    construct_query_object = rdflib.plugins.sparql.prepareQuery(
+    construct_query_object = rdflib.plugins.sparql.processor.prepareQuery(
         construct_query_text, initNs=nsdict
     )
 

case_utils/case_sparql_select/__init__.py

@@ -35,7 +35,7 @@
 import sys
 
 import pandas as pd  # type: ignore
-import rdflib.plugins.sparql  # type: ignore
+import rdflib.plugins.sparql
 
 import case_utils.ontology
 from case_utils.ontology.version_info import (
@@ -107,7 +107,7 @@ def main() -> None:
 
     tally = 0
     records = []
-    select_query_object = rdflib.plugins.sparql.prepareQuery(
+    select_query_object = rdflib.plugins.sparql.processor.prepareQuery(
         select_query_text, initNs=nsdict
     )
     for (row_no, row) in enumerate(graph.query(select_query_object)):

case_utils/case_validate/__init__.py

@@ -39,7 +39,7 @@
 import typing
 
 import pyshacl  # type: ignore
-import rdflib.util  # type: ignore
+import rdflib.util
 
 import case_utils.ontology
 from case_utils.ontology.version_info import (

case_utils/namespace.py

@@ -19,7 +19,7 @@
 
 __version__ = "0.1.0"
 
-import rdflib  # type: ignore
+import rdflib
 
 NS_SH = rdflib.SH
 NS_RDF = rdflib.RDF

setup.cfg

@@ -21,7 +21,7 @@ include_package_data = true
 install_requires =
     pandas
     pyshacl
-    rdflib >= 6.0.2
+    rdflib >= 6.2.0
     requests
     tabulate
 packages = find:

tests/Makefile

@@ -79,17 +79,17 @@ check-isomorphic_diff: \
 	  --directory isomorphic_diff \
 	  check
 
-# mypy is called against specific members of the tests directory to avoid descending into the virtual environment.
 # TODO - Fix type signatures in UCO test.
 check-mypy: \
   .venv.done.log
 	source venv/bin/activate \
 	  && mypy \
+	    --exclude case_utils/case_validate/case_test_examples/test_case_validation.py \
 	    --exclude case_utils/case_validate/uco_test_examples/test_uco_validation.py \
+	    --exclude venv \
+	    --strict \
 	    $(top_srcdir)/case_utils \
-	    case_utils \
-	    hexbinary \
-	    src
+	    .
 
 clean:
 	@$(MAKE) \

tests/case_utils/case_file/test_case_file.py

@@ -16,7 +16,7 @@
 import os
 
 import pytest
-import rdflib.plugins.sparql  # type: ignore
+import rdflib.plugins.sparql
 
 import case_utils.ontology
 from case_utils.namespace import NS_UCO_CORE, NS_UCO_OBSERVABLE, NS_UCO_TYPES
@@ -80,7 +80,9 @@ def test_confirm_hashes(graph_case_file: rdflib.Graph) -> None:
 }
 """
 
-    query_object = rdflib.plugins.sparql.prepareQuery(query_sparql, initNs=NSDICT)
+    query_object = rdflib.plugins.sparql.processor.prepareQuery(
+        query_sparql, initNs=NSDICT
+    )
 
     for result in graph_case_file.query(query_object):
         (l_hash_method, l_hash_value) = result
@@ -109,7 +111,7 @@ def test_confirm_mtime(
     .
 }
 """
-    query_object = rdflib.plugins.sparql.prepareQuery(
+    query_object = rdflib.plugins.sparql.processor.prepareQuery(
         query_confirm_mtime, initNs=NSDICT
     )
 

tests/case_utils/case_sparql_construct/test_case_sparql_construct.py

@@ -13,7 +13,7 @@
 
 import typing
 
-import rdflib.plugins.sparql  # type: ignore
+import rdflib.plugins.sparql
 
 
 def _test_subclass_templates_result(filename: str, expected: typing.Set[str]) -> None:

tests/case_utils/case_validate/cli/test_format_output_flags.py

@@ -16,7 +16,7 @@
 import typing
 
 import pytest
-import rdflib.plugins.parsers.notation3  # type: ignore
+import rdflib.plugins.parsers.notation3
 
 srcdir = pathlib.Path(__file__).parent
 
@@ -26,7 +26,7 @@
 """.strip()
 
 
-def _guess_format(basename) -> typing.Optional[str]:
+def _guess_format(basename: str) -> typing.Optional[str]:
     """
     Guess format by file extension.
     """