From 5c7643c28cecd64452186ec3409e2ed7026140ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jul 2023 19:38:24 +0000 Subject: [PATCH 1/2] build(deps-dev): bump sphinx from 5.3.0 to 6.2.1 Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 5.3.0 to 6.2.1. - [Release notes](https://github.com/sphinx-doc/sphinx/releases) - [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES) - [Commits](https://github.com/sphinx-doc/sphinx/compare/v5.3.0...v6.2.1) --- updated-dependencies: - dependency-name: sphinx dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- poetry.lock | 20 ++++++++++---------- pyproject.toml | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/poetry.lock b/poetry.lock index de0432df0..687d78ba4 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1093,26 +1093,26 @@ files = [ [[package]] name = "sphinx" -version = "5.3.0" +version = "6.2.1" description = "Python documentation generator" optional = false -python-versions = ">=3.6" +python-versions = ">=3.8" files = [ - {file = "Sphinx-5.3.0.tar.gz", hash = "sha256:51026de0a9ff9fc13c05d74913ad66047e104f56a129ff73e174eb5c3ee794b5"}, - {file = "sphinx-5.3.0-py3-none-any.whl", hash = "sha256:060ca5c9f7ba57a08a1219e547b269fadf125ae25b06b9fa7f66768efb652d6d"}, + {file = "Sphinx-6.2.1.tar.gz", hash = "sha256:6d56a34697bb749ffa0152feafc4b19836c755d90a7c59b72bc7dfd371b9cc6b"}, + {file = "sphinx-6.2.1-py3-none-any.whl", hash = "sha256:97787ff1fa3256a3eef9eda523a63dbf299f7b47e053cfcf684a1c2a8380c912"}, ] [package.dependencies] alabaster = ">=0.7,<0.8" babel = ">=2.9" colorama = {version = ">=0.4.5", markers = "sys_platform == \"win32\""} -docutils = ">=0.14,<0.20" +docutils = ">=0.18.1,<0.20" imagesize = ">=1.3" importlib-metadata = {version = ">=4.8", markers = "python_version < \"3.10\""} Jinja2 = ">=3.0" packaging = ">=21.0" -Pygments = ">=2.12" -requests = ">=2.5.0" +Pygments = ">=2.13" +requests = ">=2.25.0" snowballstemmer = ">=2.0" sphinxcontrib-applehelp = "*" sphinxcontrib-devhelp = "*" @@ -1123,8 +1123,8 @@ sphinxcontrib-serializinghtml = ">=1.1.5" [package.extras] docs = ["sphinxcontrib-websupport"] -lint = ["docutils-stubs", "flake8 (>=3.5.0)", "flake8-bugbear", "flake8-comprehensions", "flake8-simplify", "isort", "mypy (>=0.981)", "sphinx-lint", "types-requests", "types-typed-ast"] -test = ["cython", "html5lib", "pytest (>=4.6)", "typed_ast"] +lint = ["docutils-stubs", "flake8 (>=3.5.0)", "flake8-simplify", "isort", "mypy (>=0.990)", "ruff", "sphinx-lint", "types-requests"] +test = ["cython", "filelock", "html5lib", "pytest (>=4.6)"] [[package]] name = "sphinx-autodoc-typehints" @@ -1344,4 +1344,4 @@ networkx = ["networkx"] [metadata] lock-version = "2.0" python-versions = "^3.8.1" -content-hash = "bd72cf9ef87c3080a305f3b2d90f1e82fd1f8a6be2a5d5ffdfc039b5c77f292e" +content-hash = "c5774b73f06388570fcf7497bf4039472463139a1ef5f483a3da22aea57571cb" diff --git a/pyproject.toml b/pyproject.toml index c9bc2c002..01f3bd009 100644 --- 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" From afea615557346347145128f77478b013ffcc0d45 Mon Sep 17 00:00:00 2001 From: WhiteGobo Date: Wed, 5 Jul 2023 20:57:16 +0200 Subject: [PATCH 2/2] fix: TriG parser error handling for nested graphs (#2468) Raise an error when nested graphs occur in TriG. With this change, the test passes. --------- Co-authored-by: WhiteGobo Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Iwan Aucamp --- rdflib/plugins/parsers/trig.py | 3 +++ test/test_w3c_spec/test_trig_w3c.py | 3 --- test_reports/rdflib_w3c_trig-HEAD.ttl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rdflib/plugins/parsers/trig.py b/rdflib/plugins/parsers/trig.py index d28198bce..71593b5ce 100644 --- a/rdflib/plugins/parsers/trig.py +++ b/rdflib/plugins/parsers/trig.py @@ -98,6 +98,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 index ea2b02edd..d7c843340 100644 --- a/test/test_w3c_spec/test_trig_w3c.py +++ b/test/test_w3c_spec/test_trig_w3c.py @@ -176,9 +176,6 @@ def check_entry(entry: ManifestEntry) -> None: f"{REMOTE_BASE_IRI}#trig-graph-bad-01": pytest.mark.xfail( reason="accepts GRAPH with no name" ), - 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 index 7c22104d2..78a28d61c 100644 --- a/test_reports/rdflib_w3c_trig-HEAD.ttl +++ b/test_reports/rdflib_w3c_trig-HEAD.ttl @@ -971,7 +971,7 @@ earl:assertedBy ; earl:mode earl:automatic ; earl:result [ a earl:TestResult ; - earl:outcome earl:failed ] ; + earl:outcome earl:passed ] ; earl:subject ; earl:test .