diff --git a/case_utils/case_file/__init__.py b/case_utils/case_file/__init__.py index e131b2f..cd77303 100644 --- a/case_utils/case_file/__init__.py +++ b/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 ( diff --git a/case_utils/case_sparql_construct/__init__.py b/case_utils/case_sparql_construct/__init__.py index eb9610f..926dfc2 100644 --- a/case_utils/case_sparql_construct/__init__.py +++ b/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 ) diff --git a/case_utils/case_sparql_select/__init__.py b/case_utils/case_sparql_select/__init__.py index a2023bf..d36ba40 100644 --- a/case_utils/case_sparql_select/__init__.py +++ b/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)): diff --git a/case_utils/case_validate/__init__.py b/case_utils/case_validate/__init__.py index 37ea59b..88c1a2b 100644 --- a/case_utils/case_validate/__init__.py +++ b/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 ( diff --git a/case_utils/namespace.py b/case_utils/namespace.py index 6e12322..7b611a4 100644 --- a/case_utils/namespace.py +++ b/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 diff --git a/setup.cfg b/setup.cfg index ecbe655..401504c 100644 --- a/setup.cfg +++ b/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: diff --git a/tests/Makefile b/tests/Makefile index b75a75a..8960b62 100644 --- a/tests/Makefile +++ b/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) \ diff --git a/tests/case_utils/case_file/test_case_file.py b/tests/case_utils/case_file/test_case_file.py index 4e53229..067afe9 100644 --- a/tests/case_utils/case_file/test_case_file.py +++ b/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 ) diff --git a/tests/case_utils/case_sparql_construct/test_case_sparql_construct.py b/tests/case_utils/case_sparql_construct/test_case_sparql_construct.py index 81d2f4e..53e0f71 100644 --- a/tests/case_utils/case_sparql_construct/test_case_sparql_construct.py +++ b/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: diff --git a/tests/case_utils/case_validate/cli/test_format_output_flags.py b/tests/case_utils/case_validate/cli/test_format_output_flags.py index a2fe8ce..381c6f3 100644 --- a/tests/case_utils/case_validate/cli/test_format_output_flags.py +++ b/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. """ diff --git a/tests/case_utils/ontology/test_version_info.py b/tests/case_utils/ontology/test_version_info.py index 949e170..3f8e6aa 100644 --- a/tests/case_utils/ontology/test_version_info.py +++ b/tests/case_utils/ontology/test_version_info.py @@ -15,7 +15,7 @@ import pathlib import typing -import rdflib # type: ignore +import rdflib import case_utils.ontology from case_utils.ontology.version_info import ( diff --git a/tests/case_utils/test_guess_format.py b/tests/case_utils/test_guess_format.py index b84c07f..bbfe7d8 100644 --- a/tests/case_utils/test_guess_format.py +++ b/tests/case_utils/test_guess_format.py @@ -12,7 +12,7 @@ # We would appreciate acknowledgement if the software is used. import pytest -import rdflib # type: ignore +import rdflib PATH_TO_TTL = "/nonexistent/foo.ttl" PATH_TO_JSON = "/nonexistent/foo.json" diff --git a/tests/hexbinary/test_hexbinary.py b/tests/hexbinary/test_hexbinary.py index 6b63175..5f4dc96 100644 --- a/tests/hexbinary/test_hexbinary.py +++ b/tests/hexbinary/test_hexbinary.py @@ -51,7 +51,7 @@ import typing import pytest -import rdflib.plugins.sparql # type: ignore +import rdflib.plugins.sparql _logger = logging.getLogger(os.path.basename(__file__)) diff --git a/tests/src/glom_graph.py b/tests/src/glom_graph.py index 2f1b1ca..e54d8ed 100644 --- a/tests/src/glom_graph.py +++ b/tests/src/glom_graph.py @@ -17,7 +17,7 @@ __version__ = "0.2.1" -import rdflib # type: ignore +import rdflib def main() -> None: diff --git a/tests/src/isomorphic_diff.py b/tests/src/isomorphic_diff.py index 8443bb9..5caa698 100644 --- a/tests/src/isomorphic_diff.py +++ b/tests/src/isomorphic_diff.py @@ -34,7 +34,7 @@ import os import sys -import rdflib.compare # type: ignore +import rdflib.compare _logger = logging.getLogger(os.path.basename(__file__))