improve support for rdflib > 5

Author: mr-c

requirements.txt

@@ -1,6 +1,7 @@
 ruamel.yaml>= 0.12.4, != 0.16.6, < 0.18
+rdflib>= 4.2.2, < 6.0.0;python_version<='3.6'
 rdflib>= 4.2.2, < 7.0.0
-rdflib-jsonld>=0.4.0, <0.7.0
+rdflib-jsonld>=0.4.0, <= 0.6.1;python_version<='3.6'
 mistune>=0.8.1,<0.9
 CacheControl==0.12.6
 lockfile==0.12.2

schema_salad/main.py

@@ -8,6 +8,7 @@
 from urllib.parse import urlparse
 
 import pkg_resources  # part of setuptools
+from rdflib import __version__ as rdflib_version
 from rdflib.parser import Parser
 from rdflib.plugin import register
 from ruamel.yaml.comments import CommentedMap, CommentedSeq
@@ -19,7 +20,8 @@
 from .ref_resolver import Loader, file_uri
 from .utils import json_dump, stdout
 
-register("json-ld", Parser, "rdflib_jsonld.parser", "JsonLDParser")
+if int(rdflib_version.split(".")[0]) < 6:
+    register("json-ld", Parser, "rdflib_jsonld.parser", "JsonLDParser")
 _logger = logging.getLogger("salad")
 
 

setup.py

@@ -76,8 +76,9 @@
     "ruamel.yaml >= 0.12.4, != 0.16.6, < 0.18",
     # once the minimum version for ruamel.yaml >= 0.15.99
     # then please update the mypy targets in the Makefile
+    "rdflib >= 4.2.2, < 6.0.0;python_version<='3.6'",
     "rdflib >= 4.2.2, < 7.0.0",
-    "rdflib-jsonld >= 0.3.0, < 0.7.0",
+    "rdflib-jsonld >= 0.3.0, <= 0.6.1;python_version<='3.6'",
     "mistune >= 0.8.1, < 0.9",
     "CacheControl >= 0.11.7, < 0.13",
     "lockfile >= 0.9",

typeshed/rdflib/__init__.pyi

@@ -1,4 +1,7 @@
+from rdflib.container import *
 from rdflib import util as util
 from rdflib.graph import ConjunctiveGraph as ConjunctiveGraph, Dataset as Dataset, Graph as Graph
-from rdflib.namespace import CSVW as CSVW, DC as DC, DCAT as DCAT, DCTERMS as DCTERMS, DOAP as DOAP, FOAF as FOAF, Namespace as Namespace, ODRL2 as ODRL2, ORG as ORG, OWL as OWL, PROF as PROF, PROV as PROV, RDF as RDF, RDFS as RDFS, SDO as SDO, SH as SH, SKOS as SKOS, SOSA as SOSA, SSN as SSN, TIME as TIME, VOID as VOID, XMLNS as XMLNS, XSD as XSD
+from rdflib.namespace import CSVW as CSVW, DC as DC, DCAT as DCAT, DCTERMS as DCTERMS, DOAP as DOAP, FOAF as FOAF, Namespace as Namespace, ODRL2 as ODRL2, ORG as ORG, OWL as OWL, PROF as PROF, PROV as PROV, QB as QB, RDF as RDF, RDFS as RDFS, SDO as SDO, SH as SH, SKOS as SKOS, SOSA as SOSA, SSN as SSN, TIME as TIME, VOID as VOID, XMLNS as XMLNS, XSD as XSD
 from rdflib.term import BNode as BNode, Literal as Literal, URIRef as URIRef, Variable as Variable
+
+__version__: str

typeshed/rdflib/container.pyi

@@ -0,0 +1,33 @@
+from typing import Any
+
+class Container:
+    graph: Any
+    uri: Any
+    def __init__(self, graph, uri, seq=..., rtype: str = ...) -> None: ...
+    def n3(self): ...
+    def __len__(self): ...
+    def type_of_conatiner(self): ...
+    def index(self, item): ...
+    def __getitem__(self, key): ...
+    def __setitem__(self, key, value) -> None: ...
+    def __delitem__(self, key) -> None: ...
+    def items(self): ...
+    def end(self): ...
+    def append(self, item): ...
+    def append_multiple(self, other): ...
+    def clear(self): ...
+
+class Bag(Container):
+    def __init__(self, graph, uri, seq=...) -> None: ...
+
+class Alt(Container):
+    def __init__(self, graph, uri, seq=...) -> None: ...
+    def anyone(self): ...
+
+class Seq(Container):
+    def __init__(self, graph, uri, seq=...) -> None: ...
+    def add_at_position(self, pos, item): ...
+
+class NoElementException(Exception):
+    message: Any
+    def __init__(self, message: str = ...) -> None: ...

typeshed/rdflib/events.pyi

@@ -1,12 +1,8 @@
-# Stubs for rdflib.events (Python 2)
-#
-# NOTE: This dynamically typed stub was automatically generated by stubgen.
-
 class Event:
-    def __init__(self, **kw): ...
+    def __init__(self, **kw) -> None: ...
 
 class Dispatcher:
     def set_map(self, amap): ...
     def get_map(self): ...
     def subscribe(self, event_type, handler): ...
-    def dispatch(self, event): ...
+    def dispatch(self, event) -> None: ...

typeshed/rdflib/exceptions.pyi

@@ -1,37 +1,33 @@
-# Stubs for rdflib.exceptions (Python 2)
-#
-# NOTE: This dynamically typed stub was automatically generated by stubgen.
-
 from typing import Any
 
 class Error(Exception):
-    msg = ... # type: Any
-    def __init__(self, msg=None): ...
+    msg: Any
+    def __init__(self, msg: Any | None = ...) -> None: ...
 
 class TypeCheckError(Error):
-    type = ... # type: Any
-    node = ... # type: Any
-    def __init__(self, node): ...
+    type: Any
+    node: Any
+    def __init__(self, node) -> None: ...
 
 class SubjectTypeError(TypeCheckError):
-    msg = ... # type: Any
-    def __init__(self, node): ...
+    msg: Any
+    def __init__(self, node) -> None: ...
 
 class PredicateTypeError(TypeCheckError):
-    msg = ... # type: Any
-    def __init__(self, node): ...
+    msg: Any
+    def __init__(self, node) -> None: ...
 
 class ObjectTypeError(TypeCheckError):
-    msg = ... # type: Any
-    def __init__(self, node): ...
+    msg: Any
+    def __init__(self, node) -> None: ...
 
 class ContextTypeError(TypeCheckError):
-    msg = ... # type: Any
-    def __init__(self, node): ...
+    msg: Any
+    def __init__(self, node) -> None: ...
 
 class ParserError(Error):
-    msg = ... # type: Any
-    def __init__(self, msg): ...
+    msg: Any
+    def __init__(self, msg) -> None: ...
 
 class UniquenessError(Error):
-    def __init__(self, values): ...
+    def __init__(self, values) -> None: ...

typeshed/rdflib/graph.pyi

@@ -1,4 +1,4 @@
-from rdflib.term import BNode, Node
+from rdflib.term import BNode, Node, Identifier
 from typing import overload, Any, Iterator, Optional, Tuple, Union
 
 class Graph(Node):
@@ -19,7 +19,7 @@ class Graph(Node):
     def add(self, triple: Any) -> None: ...
     def addN(self, quads: Any) -> None: ...
     def remove(self, triple: Any) -> None: ...
-    def triples(self, triple: Tuple[Optional[Union[str, BNode]], Optional[Union[str, BNode]], Optional[BNode]]) -> Iterator[Tuple[BNode, BNode, BNode]]: ...
+    def triples(self, triple: Tuple[Optional[Union[str, Identifier]], Optional[Union[str, Identifier]], Optional[Identifier]]) -> Iterator[Tuple[Identifier, Identifier, Identifier]]: ...
     def __getitem__(self, item: Any): ...
     def __len__(self): ...
     def __iter__(self) -> Any: ...
@@ -85,7 +85,7 @@ class ConjunctiveGraph(Graph):
     def add(self, triple_or_quad: Any) -> None: ...
     def addN(self, quads: Any) -> None: ...
     def remove(self, triple_or_quad: Any) -> None: ...
-    #def triples(self, triple_or_quad: Tuple[Optional[Union[str, BNode]], Optional[Union[str, BNode]], Optional[BNode]], context: Tuple[Optional[Union[str, BNode]], Optional[Union[str, BNode]], Optional[BNode]]) -> Iterator[Tuple[BNode, BNode, BNode]]: ...
+    #def triples(self, triple_or_quad: Tuple[Optional[Union[str, BNode]], Optional[Union[str, BNode]], Optional[BNode]], context: Tuple[Optional[Union[str, BNode]], Optional[Union[str, BNode]], Optional[BNode]]) -> Iterator[Tuple[Identifier, Identifier, Identifier]]: ...
     def quads(self, triple_or_quad: Optional[Any] = ...) -> None: ...
     def triples_choices(self, triple: Any, context: Optional[Any] = ...) -> None: ...
     def __len__(self): ...
@@ -138,7 +138,7 @@ class ReadOnlyGraphAggregate(ConjunctiveGraph):
     def add(self, triple: Any) -> None: ...
     def addN(self, quads: Any) -> None: ...
     def remove(self, triple: Any) -> None: ...
-    def triples(self, triple: Tuple[Optional[Union[str, BNode]], Optional[Union[str, BNode]], Optional[BNode]]) -> Iterator[Tuple[BNode, BNode, BNode]]: ...
+    def triples(self, triple: Tuple[Optional[Union[str, Identifier]], Optional[Union[str, Identifier]], Optional[Identifier]]) -> Iterator[Tuple[Identifier, Identifier, Identifier]]: ...
     def __contains__(self, triple_or_quad: Any): ...
     def __len__(self): ...
     def __hash__(self) -> Any: ...

typeshed/rdflib/namespace.pyi

@@ -0,0 +1,87 @@
+from rdflib.namespace import DefinedNamespace as DefinedNamespace, Namespace as Namespace
+from rdflib.term import URIRef as URIRef
+
+class CSVW(DefinedNamespace):
+    aboutUrl: URIRef
+    base: URIRef
+    column: URIRef
+    columnReference: URIRef
+    commentPrefix: URIRef
+    datatype: URIRef
+    decimalChar: URIRef
+    default: URIRef
+    delimiter: URIRef
+    describes: URIRef
+    dialect: URIRef
+    doubleQuote: URIRef
+    encoding: URIRef
+    foreignKey: URIRef
+    format: URIRef
+    groupChar: URIRef
+    header: URIRef
+    headerRowCount: URIRef
+    lang: URIRef
+    length: URIRef
+    lineTerminators: URIRef
+    maxExclusive: URIRef
+    maxInclusive: URIRef
+    maxLength: URIRef
+    minExclusive: URIRef
+    minInclusive: URIRef
+    minLength: URIRef
+    name: URIRef
+    note: URIRef
+    null: URIRef
+    ordered: URIRef
+    pattern: URIRef
+    primaryKey: URIRef
+    propertyUrl: URIRef
+    quoteChar: URIRef
+    reference: URIRef
+    referencedRow: URIRef
+    required: URIRef
+    resource: URIRef
+    row: URIRef
+    rowTitle: URIRef
+    rownum: URIRef
+    schemaReference: URIRef
+    scriptFormat: URIRef
+    separator: URIRef
+    skipBlankRows: URIRef
+    skipColumns: URIRef
+    skipInitialSpace: URIRef
+    skipRows: URIRef
+    source: URIRef
+    suppressOutput: URIRef
+    table: URIRef
+    tableDirection: URIRef
+    tableSchema: URIRef
+    targetFormat: URIRef
+    textDirection: URIRef
+    title: URIRef
+    transformations: URIRef
+    trim: URIRef
+    url: URIRef
+    valueUrl: URIRef
+    virtual: URIRef
+    Cell: URIRef
+    Column: URIRef
+    Datatype: URIRef
+    Dialect: URIRef
+    Direction: URIRef
+    ForeignKey: URIRef
+    NumericFormat: URIRef
+    Row: URIRef
+    Schema: URIRef
+    Table: URIRef
+    TableGroup: URIRef
+    TableReference: URIRef
+    Transformation: URIRef
+    JSON: URIRef
+    uriTemplate: URIRef
+    auto: URIRef
+    inherit: URIRef
+    ltr: URIRef
+    rtl: URIRef
+    csvEncodedTabularData: URIRef
+    tabularMetadata: URIRef