From 3102c464900dfa12397fcbc06afa85ffe4a634f5 Mon Sep 17 00:00:00 2001 From: Edmond Chuc Date: Wed, 15 Jan 2025 21:34:25 +1000 Subject: [PATCH] fix: typing + imports from cherry pick --- rdflib/extras/shacl.py | 5 ++--- rdflib/graph.py | 1 + rdflib/plugins/serializers/longturtle.py | 2 -- rdflib/store.py | 1 - test_reports/rdflib_w3c_sparql10-HEAD.ttl | 8 ++++---- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/rdflib/extras/shacl.py b/rdflib/extras/shacl.py index 9485e6633..1cef32697 100644 --- a/rdflib/extras/shacl.py +++ b/rdflib/extras/shacl.py @@ -4,15 +4,14 @@ from __future__ import annotations -from typing import Optional, Union +from typing import TYPE_CHECKING, Optional, Union -from rdflib import BNode, Graph, Literal, URIRef, paths +from rdflib import BNode, Graph, Literal, Node, URIRef, paths from rdflib.collection import Collection from rdflib.namespace import RDF, SH from rdflib.paths import Path if TYPE_CHECKING: - from rdflib.graph import _ObjectType from rdflib.term import IdentifiedNode diff --git a/rdflib/graph.py b/rdflib/graph.py index a1ac3b9b6..e086df233 100644 --- a/rdflib/graph.py +++ b/rdflib/graph.py @@ -301,6 +301,7 @@ Node, RDFLibGenid, URIRef, + Variable, ) if TYPE_CHECKING: diff --git a/rdflib/plugins/serializers/longturtle.py b/rdflib/plugins/serializers/longturtle.py index 9e7cf865a..653cd2d2b 100644 --- a/rdflib/plugins/serializers/longturtle.py +++ b/rdflib/plugins/serializers/longturtle.py @@ -18,8 +18,6 @@ from __future__ import annotations -from typing import IO, Any, Optional - from rdflib.compare import to_canonical_graph from rdflib.exceptions import Error from rdflib.graph import Graph diff --git a/rdflib/store.py b/rdflib/store.py index 808e7cb31..caec88072 100644 --- a/rdflib/store.py +++ b/rdflib/store.py @@ -36,7 +36,6 @@ Generator, Iterable, Iterator, - List, Mapping, Optional, Tuple, diff --git a/test_reports/rdflib_w3c_sparql10-HEAD.ttl b/test_reports/rdflib_w3c_sparql10-HEAD.ttl index 78997b01c..b8369a94d 100644 --- a/test_reports/rdflib_w3c_sparql10-HEAD.ttl +++ b/test_reports/rdflib_w3c_sparql10-HEAD.ttl @@ -1795,7 +1795,7 @@ earl:assertedBy ; earl:mode earl:automatic ; earl:result [ a earl:TestResult ; - earl:outcome earl:failed ] ; + earl:outcome earl:passed ] ; earl:subject ; earl:test . @@ -1859,7 +1859,7 @@ earl:assertedBy ; earl:mode earl:automatic ; earl:result [ a earl:TestResult ; - earl:outcome earl:failed ] ; + earl:outcome earl:passed ] ; earl:subject ; earl:test . @@ -1907,7 +1907,7 @@ earl:assertedBy ; earl:mode earl:automatic ; earl:result [ a earl:TestResult ; - earl:outcome earl:failed ] ; + earl:outcome earl:passed ] ; earl:subject ; earl:test . @@ -2787,7 +2787,7 @@ earl:assertedBy ; earl:mode earl:automatic ; earl:result [ a earl:TestResult ; - earl:outcome earl:failed ] ; + earl:outcome earl:passed ] ; earl:subject ; earl:test .