Merge branch 'fix-issue-1808' of https://github.com/edmondchuc/rdflib …

…into fix-issue-1808

.editorconfig

@@ -20,7 +20,7 @@ trim_trailing_whitespace = false
 [*.{js,py,pyi,toml,yml,yaml}]
 charset = utf-8
 
-[*.{yaml,yml,json}]
+[*.{yaml,yml,json,jsonld}]
 indent_style = space
 indent_size = 2
 

.github/workflows/validate.yaml

@@ -104,37 +104,3 @@ jobs:
           export TOXENV
           export TOX_EXTRA_COMMAND="${{ matrix.TOX_EXTRA_COMMAND }}"
           "${test_harness[@]}" python -m tox
-  docs:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        tox-env: ["docs"]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python ${{env.DEFAULT_PYTHON}}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{env.DEFAULT_PYTHON}}
-      - name: Get pip cache dir
-        id: pip-cache
-        shell: bash
-        run: |
-          python -m ensurepip --upgrade
-          echo "::set-output name=dir::$(pip cache dir)"
-      - name: Cache pip
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.pip-cache.outputs.dir }}
-          key: tox-${{ matrix.tox-env }}-pip-v1-${{
-            hashFiles('**/setup.py', '**/requirements*.txt') }}
-          restore-keys: |
-            tox-${{ matrix.tox-env }}-pip-v1-
-      - name: Install dependencies
-        shell: bash
-        run: |
-          python -m pip install tox tox-gh-actions
-      - name: Run ${{ matrix.tox-env }}
-        shell: bash
-        run: |
-          python -m tox -e ${{ matrix.tox-env }}

.readthedocs.yaml

@@ -14,3 +14,6 @@ python:
       path: .
       extra_requirements:
         - docs
+
+sphinx:
+  fail_on_warning: true

README.md

@@ -22,11 +22,17 @@ The RDFlib community maintains many RDF-related Python code repositories with di
 * [rdflib](https://github.com/RDFLib/rdflib) - the RDFLib core
 * [sparqlwrapper](https://github.com/RDFLib/sparqlwrapper) - a simple Python wrapper around a SPARQL service to remotely execute your queries
 * [pyLODE](https://github.com/RDFLib/pyLODE) - An OWL ontology documentation tool using Python and templating, based on LODE.
+* [pyrdfa3](https://github.com/RDFLib/pyrdfa3) - RDFa 1.1 distiller/parser library: can extract RDFa 1.1/1.0 from (X)HTML, SVG, or XML in general.
+* [pymicrodata](https://github.com/RDFLib/pymicrodata) - A module to extract RDF from an HTML5 page annotated with microdata. 
+* [pySHACL](https://github.com/RDFLib/pySHACL) - A pure Python module which allows for the validation of RDF graphs against SHACL graphs.
+* [OWL-RL](https://github.com/RDFLib/OWL-RL) - A simple implementation of the OWL2 RL Profile which expands the graph with all possible triples that OWL RL defines.
 
 Please see the list for all packages/repositories here:
 
 * <https://github.com/RDFLib>
 
+Help with maintenance of all of the RDFLib family of packages is always welcome and appreciated.
+
 ## Versions & Releases
 
 * `6.2.0-alpha` current `master` branch

admin/get_merged_prs.py

@@ -1,9 +1,9 @@
 """Get all merged PRs since last release, save them to a JSON file"""
 
-import httpx
 import json
 from datetime import datetime
 
+import httpx
 
 r = httpx.get(
     "https://api.github.com/repos/rdflib/rdflib/pulls",

docs/conf.py

@@ -11,9 +11,9 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
 import re
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -243,3 +243,9 @@ def find_version(filename):
 html_experimental_html5_writer = True
 
 needs_sphinx = "4.1.2"
+
+suppress_warnings = [
+    # This is here to prevent:
+    #  "WARNING: more than one target found for cross-reference"
+    "ref.python",
+]

docs/developers.rst

@@ -38,7 +38,7 @@ met:
 
   There should either be existing tests that cover the changed code and
   behaviour, or the PR should include tests. For more information about what is
-  considered adequate testing see the :ref:`Tests section <Tests>`.
+  considered adequate testing see the :ref:`Tests section <tests>`.
 
 * Documentation that covers something that changed has been updated.
 
@@ -65,7 +65,7 @@ the users of this project.
 Please note that while we would like all PRs to follow the guidelines given
 here, we will not reject a PR just because it does not.
 
-.. Tests:
+.. _tests:
 
 Tests
 -----

docs/rdf_terms.rst

@@ -13,64 +13,64 @@ All terms in RDFLib are sub-classes of the :class:`rdflib.term.Identifier` class
    :caption: Term Class Hierarchy
    :type: plantuml
 
-@startuml
-skinparam shadowing false
-skinparam monochrome true
-skinparam packageStyle rectangle
-skinparam backgroundColor FFFFFE
-
-class Node
-
-class Identifier {
-    eq(other) -> bool
-    neq(other) -> bool
-    startswith(prefix: str, start, end) -> bool
-}
-Identifier -up-|> Node
-
-class IdentifiedNode {
-    toPython() -> str
-}
-IdentifiedNode -up-|> Identifier
-
-class URIRef {
-    n3(namespace_manager) -> str
-    defrag() -> URIRef
-    de_skolemize() -> BNode
-}
-URIRef -up-|> IdentifiedNode
-
-
-class Genid
-Genid -up-|> URIRef
-
-class RDFLibGenid
-RDFLibGenid -up-|> Genid
-
-class BNode {
-    n3(namespace_manager) -> str
-    skolemize(authority, basepath) -> RDFLibGenid
-}
-BNode -up-|> IdentifiedNode
-
-class Literal {
-    datatype: Optional[str]
-    lang: Optional[str]
-    value: Any
-
-    normalize() -> Literal
-    n3(namespace_manager) -> str
-    toPython() -> str
-}
-Literal -up-|> Identifier
-
-class Variable {
-    n3(namespace_manager) -> str
-    toPython() -> str
-}
-Variable -up-|> Identifier
-
-@enduml
+    @startuml
+    skinparam shadowing false
+    skinparam monochrome true
+    skinparam packageStyle rectangle
+    skinparam backgroundColor FFFFFE
+    
+    class Node
+    
+    class Identifier {
+        eq(other) -> bool
+        neq(other) -> bool
+        startswith(prefix: str, start, end) -> bool
+    }
+    Identifier -up-|> Node
+    
+    class IdentifiedNode {
+        toPython() -> str
+    }
+    IdentifiedNode -up-|> Identifier
+    
+    class URIRef {
+        n3(namespace_manager) -> str
+        defrag() -> URIRef
+        de_skolemize() -> BNode
+    }
+    URIRef -up-|> IdentifiedNode
+    
+    
+    class Genid
+    Genid -up-|> URIRef
+    
+    class RDFLibGenid
+    RDFLibGenid -up-|> Genid
+    
+    class BNode {
+        n3(namespace_manager) -> str
+        skolemize(authority, basepath) -> RDFLibGenid
+    }
+    BNode -up-|> IdentifiedNode
+    
+    class Literal {
+        datatype: Optional[str]
+        lang: Optional[str]
+        value: Any
+    
+        normalize() -> Literal
+        n3(namespace_manager) -> str
+        toPython() -> str
+    }
+    Literal -up-|> Identifier
+    
+    class Variable {
+        n3(namespace_manager) -> str
+        toPython() -> str
+    }
+    Variable -up-|> Identifier
+    
+    @enduml
 
 Nodes are a subset of the Terms that the underlying store actually persists.
 The set of such Terms depends on whether or not the store is formula-aware. 

pyproject.toml

@@ -19,7 +19,6 @@ exclude = '''
     | htmlcov
     | benchmarks
     | examples       # No need to Black examples
-    | test           # Tests are a mess, don't black them
     | test_reports
     | rdflib.egg-info
     | buck-out

rdflib/__init__.py

@@ -86,8 +86,8 @@
     "util",
 ]
 
-import sys
 import logging
+import sys
 
 logger = logging.getLogger(__name__)
 
@@ -97,6 +97,7 @@
     if (
         not hasattr(__main__, "__file__")
         and sys.stdout is not None
+        and hasattr(sys.stderr, "isatty")
         and sys.stderr.isatty()
     ):
         # show log messages in interactive mode
@@ -156,13 +157,8 @@
 Literal work, eq, __neq__, __lt__, etc.
 """
 
-from rdflib.term import URIRef, BNode, IdentifiedNode, Literal, Variable
-
-from rdflib.graph import Dataset, Graph, ConjunctiveGraph
-
-from rdflib import plugin
-from rdflib import query
-
+from rdflib import plugin, query
+from rdflib.graph import ConjunctiveGraph, Dataset, Graph
 from rdflib.namespace import (
     BRICK,
     CSVW,
@@ -192,11 +188,11 @@
     XSD,
     Namespace,
 )
+from rdflib.term import BNode, IdentifiedNode, Literal, URIRef, Variable
 
 # tedious sop to flake8
 assert plugin
 assert query
 
 from rdflib import util
-
 from rdflib.container import *

rdflib/collection.py

@@ -1,7 +1,5 @@
 from rdflib.namespace import RDF
-from rdflib.term import BNode
-from rdflib.term import Literal
-
+from rdflib.term import BNode, Literal
 
 __all__ = ["Collection"]
 

rdflib/compare.py

@@ -73,10 +73,7 @@
     _:cb558f30e21ddfc05ca53108348338ade8
         <http://example.org/ns#label> "B" .
 """
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
+from __future__ import absolute_import, division, print_function
 
 # TODO:
 # - Doesn't handle quads.
@@ -92,24 +89,24 @@
     "similar",
 ]
 
-from rdflib.graph import Graph, ConjunctiveGraph, ReadOnlyGraphAggregate
-from rdflib.term import BNode, Node, URIRef, IdentifiedNode
-from hashlib import sha256
-
-from datetime import datetime
 from collections import defaultdict
+from datetime import datetime
+from hashlib import sha256
 from typing import (
-    Set,
-    Dict,
     TYPE_CHECKING,
-    Union,
-    List,
-    Tuple,
     Callable,
-    Optional,
+    Dict,
     Iterator,
+    List,
+    Optional,
+    Set,
+    Tuple,
+    Union,
 )
 
+from rdflib.graph import ConjunctiveGraph, Graph, ReadOnlyGraphAggregate
+from rdflib.term import BNode, IdentifiedNode, Node, URIRef
+
 if TYPE_CHECKING:
     from _hashlib import HASH
 

rdflib/compat.py

@@ -3,12 +3,11 @@
 and different versions of support libraries.
 """
 
-import re
 import codecs
+import re
 import warnings
 from typing import TYPE_CHECKING, Match
 
-
 if TYPE_CHECKING:
     import xml.etree.ElementTree as etree
 else:
@@ -18,16 +17,6 @@
         import xml.etree.ElementTree as etree
 
 
-try:
-    etree_register_namespace = etree.register_namespace
-except AttributeError:
-
-    import xml.etree.ElementTree as etreenative
-
-    def etree_register_namespace(prefix, uri):
-        etreenative._namespace_map[uri] = prefix
-
-
 def cast_bytes(s, enc="utf-8"):
     if isinstance(s, str):
         return s.encode(enc)

rdflib/container.py

@@ -1,6 +1,7 @@
+from random import randint
+
 from rdflib.namespace import RDF
 from rdflib.term import BNode, URIRef
-from random import randint
 
 __all__ = ["Container", "Bag", "Seq", "Alt", "NoElementException"]