Merge branch 'main' into trig-xfail-GRAPH-only-with-name

RDFLib · Jul 5, 2023 · c1bbb72 · c1bbb72
2 parents 0f5da49 + afea615
commit c1bbb72
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -60,7 +60,7 @@ types-setuptools = ">=65.6.0.3,<69.0.0.0"
 setuptools = ">=65.6.3,<69.0.0"
 
 [tool.poetry.group.docs.dependencies]
-sphinx = "^5.3.0"
+sphinx = ">=5.3,<7.0"
 myst-parser = "^1.0.0"
 sphinxcontrib-apidoc = "^0.3.0"
 sphinx-autodoc-typehints = "^1.17.1"

diff --git a/rdflib/plugins/parsers/trig.py b/rdflib/plugins/parsers/trig.py
@@ -102,6 +102,9 @@ def graph(self, argstr: str, i: int) -> int:
 
         j = i + 1
 
+        if self._context is not None:
+            self.BadSyntax(argstr, i, "Nested graphs are not allowed")
+
         oldParentContext = self._parentContext
         self._parentContext = self._context
         reason2 = self._reason2

diff --git a/test/test_w3c_spec/test_trig_w3c.py b/test/test_w3c_spec/test_trig_w3c.py
@@ -173,9 +173,6 @@ def check_entry(entry: ManifestEntry) -> None:
     f"{REMOTE_BASE_IRI}#trig-syntax-bad-list-04": pytest.mark.xfail(
         reason="ignores badly formed quad"
     ),
-    f"{REMOTE_BASE_IRI}#trig-graph-bad-07": pytest.mark.xfail(
-        reason="accepts nested GRAPH"
-    ),
 }
 
 

diff --git a/test_reports/rdflib_w3c_trig-HEAD.ttl b/test_reports/rdflib_w3c_trig-HEAD.ttl
@@ -971,7 +971,7 @@
     earl:assertedBy <https://github.com/RDFLib/rdflib> ;
     earl:mode earl:automatic ;
     earl:result [ a earl:TestResult ;
-            earl:outcome earl:failed ] ;
+            earl:outcome earl:passed ] ;
     earl:subject <https://github.com/RDFLib/rdflib> ;
     earl:test <http://www.w3.org/2013/TriGTests/#trig-graph-bad-07> .