Merge branch 'main' into n3-no-norm-float

ashleysommer · web-flow · commit 21b41133e54a · 2025-01-09T14:45:34.000+10:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,7 +8,7 @@ ci:
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # WARNING: Ruff version should be the same as in `pyproject.toml`
-    rev: v0.7.2
+    rev: v0.8.6
     hooks:
       - id: ruff
         args: ["--fix"]
@@ -21,9 +21,9 @@ repos:
       require_serial: true
       args: ["."]
   - repo: https://github.com/python-poetry/poetry
-    rev: 1.8.4
+    rev: 2.0.0
     hooks:
     - id: poetry-check
     - id: poetry-lock
       # sadly `--no-update` does not work on pre-commit.ci
-      args: ["--check"]
+
diff --git a/CITATION.cff b/CITATION.cff
@@ -4,9 +4,12 @@ authors:
 - family-names: "Krech"
   given-names: "Daniel"
 - family-names: "Grimnes"
-  given-names: "Gunnar AAstrand"
+  given-names: "Gunnar Aastrand"
 - family-names: "Higgins"
   given-names: "Graham"
+- family-names: "Car"
+  given-names: "Nicholas"
+  orcid: "https://orcid.org/0000-0002-8742-7730"
 - family-names: "Hees"
   given-names: "Jörn"
   orcid: "https://orcid.org/0000-0002-0084-8998"
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -46,6 +46,7 @@ Daniel Krech
 Dann Martens
 Darren Garvey
 Dave Challis
+David Habgood
 David H Jones
 David Steinberg
 Debabrata Deka
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2002-2024, RDFLib Team
+Copyright (c) 2002-2025, RDFLib Team
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/devtools/requirements-poetry.in b/devtools/requirements-poetry.in
@@ -1,3 +1,4 @@
 # Fixing this here as readthedocs can't use the compiled requirements-poetry.txt
 # due to conflicts.
-poetry==1.8.5
+poetry==2.0.0
+poetry-plugin-export==1.8.0
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,26 +1,27 @@
-[tool.poetry]
+[project]
 name = "rdflib"
 version = "8.0.0a0"
 description = """RDFLib is a Python library for working with RDF, \
 a simple yet powerful language for representing information."""
-authors = ["Daniel 'eikeon' Krech <eikeon@eikeon.com>"]
-maintainers = ["RDFLib Team <rdflib-dev@googlegroups.com>"]
+authors = [{ name = "Daniel 'eikeon' Krech", email = "eikeon@eikeon.com" }]
+maintainers = [{ name = "RDFLib Team", email = "rdflib-dev@googlegroups.com" }]
 repository = "https://github.com/RDFLib/rdflib"
 documentation = "https://rdflib.readthedocs.org/"
 license = "BSD-3-Clause"
-classifiers=[
+classifiers = [
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "License :: OSI Approved :: BSD License",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Operating System :: OS Independent",
     "Natural Language :: English"
 ]
+requires-python = ">=3.9,<4"
 readme = "README.md"
 packages = [
     { include = "rdflib" },
@@ -30,27 +31,19 @@ include = [
     { path = "docs", format = "sdist" },
     { path = "examples", format = "sdist" },
 ]
+dynamic = [ "dependencies" ]
+dependencies = [
+    'isodate >=0.7.2,<1.0.0; python_version < "3.11"',
+    'pyparsing >=3.2.0,<4'
+]
 
-[tool.poetry.scripts]
+[project.scripts]
 rdfpipe = 'rdflib.tools.rdfpipe:main'
 csv2rdf = 'rdflib.tools.csv2rdf:main'
 rdf2dot = 'rdflib.tools.rdf2dot:main'
 rdfs2dot = 'rdflib.tools.rdfs2dot:main'
 rdfgraphisomorphism = 'rdflib.tools.graphisomorphism:main'
 
-[tool.poetry.dependencies]
-python = ">=3.9,<4"
-isodate = {version=">=0.7.2,<1.0.0", python = "<3.11"}
-pyparsing = ">=3.2.0,<4"
-berkeleydb = {version = "^18.1.0", optional = true}
-networkx = {version = ">=2,<4", optional = true}
-html5rdf = {version = ">=1.2.1,<2", optional = true}
-lxml = [
-    {version = ">=4.8.0,<6.0", optional = true, python = "<3.11"},
-    {version = ">=4.9.3,<6.0", optional = true, python = ">=3.11"}
-]
-orjson = {version = ">=3.9.14,<4", optional = true}
-
 [tool.poetry.group.dev.dependencies]
 black = "24.10.0"
 mypy = "^1.13.0"
@@ -73,19 +66,22 @@ sphinx-autodoc-typehints = ">=2.3.0,<2.4.0"
 typing-extensions = "^4.11.0"
 
 [tool.poetry.group.lint.dependencies]
-ruff = ">=0.7.2,<1"
+ruff = "0.8.6"
 
-[tool.poetry.extras]
-berkeleydb = ["berkeleydb"]
-networkx = ["networkx"]
+[project.optional-dependencies]
+berkeleydb = ["berkeleydb >18.1.0"]
+networkx = ["networkx >=2,<4"]
 # html support is optional, it is used only in tokenizing `rdf:HTML` type Literals
-html = ["html5rdf"]
+html = ["html5rdf >=1.2.1,<2"]
 # lxml support is optional, it is used only for parsing XML-formatted SPARQL results
-lxml = ["lxml"]
-orjson = ["orjson"]
+lxml = [
+    'lxml >=4.8.0,<6.0; python_version <"3.11"',
+    'lxml >=4.9.3,<6.0; python_version >="3.11"',
+]
+orjson = ["orjson >=3.9.14,<4"]
 
 [build-system]
-requires = ["poetry-core>=1.9.1"]
+requires = ["poetry-core>=2.0.0"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.ruff]
@@ -288,3 +284,6 @@ exclude_lines = [
     "if __name__ == .__main__.:",
     "if __name__==.__main__.:"
 ]
+
+[tool.poetry.requires-plugins]
+poetry-plugin-export = ">=1.8.0"
diff --git a/rdflib/graph.py b/rdflib/graph.py
@@ -1417,7 +1417,7 @@ def serialize(
                 else:
                     os_path = location
             with open(os_path, "wb") as stream:
-                serializer.serialize(stream, encoding=encoding, **args)
+                serializer.serialize(stream, base=base, encoding=encoding, **args)
         return self
 
     def print(
diff --git a/rdflib/plugins/sparql/parser.py b/rdflib/plugins/sparql/parser.py
@@ -1483,7 +1483,7 @@ def expandCollection(terms: ParseResults) -> list[list[Any]]:
 AskQuery = Comp(
     "AskQuery",
     Keyword("ASK")
-    + Param("datasetClause", ZeroOrMore(DatasetClause))
+    + ZeroOrMore(ParamList("datasetClause", DatasetClause))
     + WhereClause
     + SolutionModifier
     + ValuesClause,
diff --git a/run_tests.py b/run_tests.py
@@ -6,7 +6,7 @@
 spec of pytest, but with some options pre-set. To begin with, make sure you have
 pytest installed, e.g.:
 
-    $ pip install pytest
+    $ poetry add pytest
 
 To run the tests, use:
 
diff --git a/scratch_skolem.py b/scratch_skolem.py
diff --git a/test/test_sparql/test_dataset_exclusive.py b/test/test_sparql/test_dataset_exclusive.py
@@ -82,3 +82,13 @@ def test_from_and_from_named():
         (None, URIRef("urn:s1"), URIRef("urn:p1"), URIRef("urn:o1")),
         (URIRef("urn:g2"), URIRef("urn:s2"), URIRef("urn:p2"), URIRef("urn:o2")),
     ]
+
+
+def test_ask_from():
+    query = """
+        ASK
+        FROM <urn:g1>
+        WHERE {?s ?p ?o}
+    """
+    results = bool(dataset.query(query))
+    assert results
diff --git a/tox.ini b/tox.ini
@@ -20,7 +20,7 @@ setenv =
 commands_pre =
     py3{9,10,11,12}: python -c 'import os; print("\n".join(f"{key}={value}" for key, value in os.environ.items()))'
     py3{9,10,11,12}: poetry check --lock
-    py3{9,10,11,12}: poetry install --no-root --only=main --only=dev --only=lint --only=tests {env:POETRY_ARGS_docs:} {env:POETRY_ARGS_extensive:} {env:POETRY_ARGS_lxml:} {env:POETRY_ARGS:} --sync
+    py3{9,10,11,12}: poetry sync --no-root --only=main --only=dev --only=lint --only=tests {env:POETRY_ARGS_docs:} {env:POETRY_ARGS_extensive:} {env:POETRY_ARGS_lxml:} {env:POETRY_ARGS:}
 commands =
     min: python -c 'import sys; print("min qualifier not supported on this environment"); sys.exit(1);'
     poetry config --list
