Merge branch 'master' into default_prefixes

Author: Nicholas Car

.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

docs/conf.py

@@ -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 `Tests directory for examples <https://github.com/RDFLib/rdflib/tree/master/test>`_.
+  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

@@ -81,6 +81,7 @@ All terms in RDFLib are sub-classes of the :class:`rdflib.term.Identifier` class
     @enduml
 
 Nodes are a subset of the Terms that underlying stores actually persist.
+
 The set of such Terms depends on whether or not the store is formula-aware. 
 Stores that aren't formula-aware only persist those terms core to the
 RDF Model but those that are formula-aware also persist the N3

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/exceptions.py

@@ -4,11 +4,6 @@
 
 __all__ = [
     "Error",
-    "TypeCheckError",
-    "SubjectTypeError",
-    "PredicateTypeError",
-    "ObjectTypeError",
-    "ContextTypeError",
     "ParserError",
 ]
 
@@ -21,61 +16,6 @@ def __init__(self, msg=None):
         self.msg = msg
 
 
-class TypeCheckError(Error):
-    """Parts of assertions are subject to type checks."""
-
-    def __init__(self, node):
-        Error.__init__(self, node)
-        self.type = type(node)
-        self.node = node
-
-
-class SubjectTypeError(TypeCheckError):
-    """Subject of an assertion must be an instance of URIRef."""
-
-    def __init__(self, node):
-        TypeCheckError.__init__(self, node)
-        self.msg = "Subject must be instance of URIRef or BNode: %s(%s)" % (
-            self.node,
-            self.type,
-        )
-
-
-class PredicateTypeError(TypeCheckError):
-    """Predicate of an assertion must be an instance of URIRef."""
-
-    def __init__(self, node):
-        TypeCheckError.__init__(self, node)
-        self.msg = "Predicate must be a URIRef instance: %s(%s)" % (
-            self.node,
-            self.type,
-        )
-
-
-class ObjectTypeError(TypeCheckError):
-    """Object of an assertion must be an instance of URIRef, Literal,
-    or BNode."""
-
-    def __init__(self, node):
-        TypeCheckError.__init__(self, node)
-        self.msg = (
-            "\
-Object must be instance of URIRef, Literal, or BNode: %s(%s)"
-            % (self.node, self.type)
-        )
-
-
-class ContextTypeError(TypeCheckError):
-    """Context of an assertion must be an instance of URIRef."""
-
-    def __init__(self, node):
-        TypeCheckError.__init__(self, node)
-        self.msg = "Context must be instance of URIRef or BNode: %s(%s)" % (
-            self.node,
-            self.type,
-        )
-
-
 class ParserError(Error):
     """RDF Parser error."""
 

rdflib/namespace/__init__.py

@@ -1,10 +1,10 @@
+import json
 import logging
 import warnings
+from pathlib import Path
 from functools import lru_cache
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, Union, Iterable
 from unicodedata import category
-
-from pathlib import Path
 from urllib.parse import urldefrag
 from urllib.parse import urljoin
 
@@ -246,6 +246,15 @@ def __dir__(cls) -> Iterable[str]:
         values = {cls[str(x)] for x in cls.__annotations__}
         return values
 
+    def as_jsonld_context(self, pfx: str) -> dict:
+        """Returns this DefinedNamespace as a a JSON-LD 'context' object"""
+        terms = {pfx: str(self._NS)}
+        for key, term in self.__annotations__.items():
+            if issubclass(term, URIRef):
+                terms[key] = f'{pfx}:{key}'
+
+        return {'@context': terms}
+
 
 class DefinedNamespace(metaclass=DefinedNamespaceMeta):
     """

rdflib/plugins/sparql/results/tsvresults.py

@@ -68,30 +68,24 @@ def parse(self, source, content_type=None):
             # if reading from source returns bytes do utf-8 decoding
             source = codecs.getreader("utf-8")(source)
 
-        try:
-            r = Result("SELECT")
-
-            header = source.readline()
-
-            r.vars = list(HEADER.parseString(header.strip(), parseAll=True))
-            r.bindings = []
-            while True:
-                line = source.readline()
-                if not line:
-                    break
-                line = line.strip("\n")
-                if line == "":
-                    continue
-
-                row = ROW.parseString(line, parseAll=True)
-                r.bindings.append(dict(zip(r.vars, (self.convertTerm(x) for x in row))))
-
-            return r
-
-        except ParseException as err:
-            print(err.line)
-            print(" " * (err.column - 1) + "^")
-            print(err)
+        r = Result("SELECT")
+
+        header = source.readline()
+
+        r.vars = list(HEADER.parseString(header.strip(), parseAll=True))
+        r.bindings = []
+        while True:
+            line = source.readline()
+            if not line:
+                break
+            line = line.strip("\n")
+            if line == "":
+                continue
+
+            row = ROW.parseString(line, parseAll=True)
+            r.bindings.append(dict(zip(r.vars, (self.convertTerm(x) for x in row))))
+
+        return r
 
     def convertTerm(self, t):
         if t is NONE_VALUE: