RDFLib · floresbakker · Oct 28, 2024 · Oct 28, 2024 · Oct 30, 2024 · Oct 30, 2024
diff --git a/.dockerignore b/.dockerignore
@@ -1,5 +1,6 @@
 .tox
 .venv
+.venv39
 .mypy_cache
 .pytest_cache
 .git

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,10 +9,6 @@ updates:
     # see https://github.com/dependabot/dependabot-core/pull/10194
     versioning-strategy: auto
     ignore:
-      - dependency-name: sphinx
-        versions:
-          - 3.4.3
-          - 3.5.2
       # We only use setuptools for a couple of things in the test suite
       # There is no need to keep it bleeding-edge. There are too frequent
       # updates to setuptools, requires too much maintenance to keep it up to date.

diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml
@@ -25,26 +25,26 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
         os: [ubuntu-latest, macos-latest, windows-latest]
         # This is used for injecting additional tests for a specific python
         # version and OS.
         suffix: [""]
         include:
-          - python-version: "3.8"
+          - python-version: "3.9"
             os: ubuntu-latest
             extensive-tests: true
             TOXENV_SUFFIX: "-docs"
-          - python-version: "3.8"
+          - python-version: "3.9"
             os: ubuntu-latest
             extensive-tests: true
             PREPARATION: "sudo apt-get install -y libxml2-dev libxslt-dev"
             suffix: "-min"
             TOXENV_SUFFIX: "-min"
-          - python-version: "3.9"
+          - python-version: "3.10"
             os: ubuntu-latest
             TOXENV_SUFFIX: "-docs"
-          - python-version: "3.10"
+          - python-version: "3.11"
             os: ubuntu-latest
             TOX_EXTRA_COMMAND: "- black --check --diff ./rdflib"
             TOXENV_SUFFIX: "-lxml"
@@ -55,6 +55,10 @@ jobs:
             extensive-tests: true
             TOX_TEST_HARNESS: "firejail --net=none --"
             TOX_PYTEST_EXTRA_ARGS: "-m 'not webtest'"
+          - python-version: "3.12"
+            os: ubuntu-latest
+            TOX_EXTRA_COMMAND: "- black --check --diff ./rdflib"
+            TOXENV_SUFFIX: "-lxml"
     steps:
       - uses: actions/checkout@v4
       - name: Cache XDG_CACHE_HOME
@@ -121,7 +125,7 @@ jobs:
       matrix:
         include:
           - task: "gha:lint"
-            python-version: 3.8
+            python-version: 3.9
     steps:
       - uses: actions/checkout@v4
       - name: Cache XDG_CACHE_HOME

diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,14 @@
 .flakeheaven_cache/
 RDFLib.sublime-project
-/docs/_build/
 RDFLib.sublime-workspace
 coverage/
 cov.xml
 /.hgtags
 /.hgignore
 build/
 /docs/draft/
+/docs/apidocs/
+/docs/_build/
 *~
 test_reports/*latest.ttl
 # PyCharm
@@ -139,6 +140,7 @@ celerybeat.pid
 # Environments
 .env
 .venv
+.venv39
 env/
 venv/
 ENV/

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,29 +1,29 @@
 ---
 ci:
   # https://pre-commit.ci/#configuration
-  autoupdate_schedule: weekly
+  autoupdate_schedule: quarterly
   autofix_prs: false
 
 # https://pre-commit.com/#adding-pre-commit-plugins-to-your-project
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # WARNING: Ruff version should be the same as in `pyproject.toml`
-    rev: v0.5.4
+    rev: v0.8.6
     hooks:
       - id: ruff
         args: ["--fix"]
   - repo: https://github.com/psf/black-pre-commit-mirror
     # WARNING: Black version should be the same as in `pyproject.toml`
-    rev: "24.4.2"
+    rev: "24.10.0"
     hooks:
     - id: black
       pass_filenames: false
       require_serial: true
       args: ["."]
   - repo: https://github.com/python-poetry/poetry
-    rev: 1.8.3
+    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/.readthedocs.yaml b/.readthedocs.yaml
@@ -1,20 +1,19 @@
 ---
 # https://docs.readthedocs.io/en/stable/config-file/v2.html
 version: 2
-# NOTE: not builing epub because epub does not know how to handle .ico files
+# NOTE: not building epub because epub does not know how to handle .ico files
 # which results in a warning which causes the build to fail due to
 # `sphinx.fail_on_warning`
 # https://github.com/sphinx-doc/sphinx/issues/10350
 formats:
   - htmlzip
   - pdf
 
+# https://docs.readthedocs.com/platform/stable/intro/mkdocs.html
 build:
-  os: ubuntu-20.04
+  os: "ubuntu-24.04"
   tools:
-    # Using 3.9 as earlier versions have trouble generating documentation for
-    # `@typing.overload`` with type aliases.
-    python: "3.9"
+    python: "3"
   jobs:
     post_create_environment:
     # Using requirements-poetry.in as requirements-poetry.txt has conflicts with
@@ -24,7 +23,6 @@ build:
     - poetry export --only=main --only=docs --without-hashes -o requirements.txt
     - pip install --no-cache-dir -r requirements.txt
     - pip install .
-    - python -c "from rdflib import Graph; print(Graph)"
 
-sphinx:
-  fail_on_warning: true
+mkdocs:
+  configuration: mkdocs.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,26 @@
+## 2025-01-10 RELEASE 7.1.2
+
+A minor release that bumped up a few dev dependencies and achieved a few small but notable improvements, particularly with longturtle sorting:
+
+Feature PRs:
+
+* [PR #2963](https://github.com/RDFLib/rdflib/pull/2963) Big typing updates
+* [PR #2964](https://github.com/RDFLib/rdflib/pull/2964) Defined Namesapce warnings fix
+* [PR #2971](https://github.com/RDFLib/rdflib/pull/2971) convert uses of Optional and some Union usage to union operator |
+* [PR #2989](https://github.com/RDFLib/rdflib/pull/2989) Fixed incorrect ASK behaviour for dataset with one element
+* [PR #2997](https://github.com/RDFLib/rdflib/pull/2997) sort longturtle blank nodes
+* [PR #3008](https://github.com/RDFLib/rdflib/pull/3008) deterministic longturtle serialisation using RDF canonicalization + n-triples sort
+* [PR #3012](https://github.com/RDFLib/rdflib/pull/3012) Dataset documentation improvements
+
+Dependency bumps:
+
+* ruff from 0.71 -> 0.8.6
+* orjson  3.10.10 -> 
+* pytest-cov to 6.0.0
+* coverage to 7.6.10
+* pytest to 8.3.4
+* poetry to 2.0.0
+
 ## 2024-10-17 RELEASE 7.1.1
 
 This minor release removes the dependency on some only Python packages, in particular 

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"
@@ -69,7 +72,7 @@ authors:
 - family-names: "Stuart"
   given-names: "Veyndan"
 title: "RDFLib"
-version: 7.1.1
-date-released: 2024-10-28
+version: 7.1.2
+date-released: 2025-01-10
 url: "https://github.com/RDFLib/rdflib"
 doi: 10.5281/zenodo.6845245
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/MANIFEST.in b/MANIFEST.in
@@ -9,4 +9,5 @@ recursive-include examples *.py
 graft test
 graft docs
 prune docs/_build
+prune site/
 global-exclude *.pyc *$py.class
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
-![](docs/_static/RDFlib.png)    
+![](docs/_static/RDFlib.png)
+
+# RDFLib
 
-RDFLib
-======
 [![Build Status](https://github.com/RDFLib/rdflib/actions/workflows/validate.yaml/badge.svg?branch=main)](https://github.com/RDFLib/rdflib/actions?query=branch%3Amain)
 [![Documentation Status](https://readthedocs.org/projects/rdflib/badge/?version=latest)](https://rdflib.readthedocs.io/en/latest/?badge=latest)
 [![Coveralls branch](https://img.shields.io/coveralls/RDFLib/rdflib/main.svg)](https://coveralls.io/r/RDFLib/rdflib?branch=main)
@@ -31,7 +31,7 @@ The RDFlib community maintains many RDF-related Python code repositories with di
 * [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. 
+* [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.
 
@@ -43,13 +43,15 @@ Help with maintenance of all of the RDFLib family of packages is always welcome
 
 ## Versions & Releases
 
-* `main` branch in this repository is the unstable release
-* `7.1.1` current stable release, bugfixes to 7.1.0
-* `7.0.0` previous stable release, supports Python 3.8.1+ only.
-    * see [Releases](https://github.com/RDFLib/rdflib/releases)
+* `main` branch in this repository is the current unstable release - version 8 alpha
+* `7.1.4` tidy-up release, possibly last 7.x release
+* `7.1.2` current stable release, small improvements on to 7.1.1
+* `7.1.1` previous stable release
+    * see <https://github.com/RDFLib/rdflib/releases/tag/7.1.1>
 * `6.x.y` supports Python 3.7+ only. Many improvements over 5.0.0
-    * see [Releases](https://github.com/RDFLib/rdflib/releases)
+    * see <https://github.com/RDFLib/rdflib/releases/tag/6.3.2>
 * `5.x.y` supports Python 2.7 and 3.4+ and is [mostly backwards compatible with 4.2.2](https://rdflib.readthedocs.io/en/stable/upgrade4to5.html).
+  * * see <https://github.com/RDFLib/rdflib/releases/tag/5.0.0>
 
 See <https://github.com/RDFLib/rdflib/releases/> for the release details.
 
@@ -68,7 +70,7 @@ Some features of RDFLib require optional dependencies which may be installed usi
 Alternatively manually download the package from the Python Package
 Index (PyPI) at https://pypi.python.org/pypi/rdflib
 
-The current version of RDFLib is 7.1.1, see the ``CHANGELOG.md`` file for what's new in this release.
+The current version of RDFLib is 7.1.2, see the ``CHANGELOG.md`` file for what's new in this release.
 
 ### Installation of the current main branch (for developers)
 
@@ -132,18 +134,21 @@ g.add((
     Literal("Nick", datatype=XSD.string)
 ))
 ```
+
 The triple (in n-triples notation) `<http://example.com/person/nick> <http://xmlns.com/foaf/0.1/givenName> "Nick"^^<http://www.w3.org/2001/XMLSchema#string> .`
 is created where the property `FOAF.givenName` is the URI `<http://xmlns.com/foaf/0.1/givenName>` and `XSD.string` is the
 URI `<http://www.w3.org/2001/XMLSchema#string>`.
 
 You can bind namespaces to prefixes to shorten the URIs for RDF/XML, Turtle, N3, TriG, TriX & JSON-LD serializations:
 
- ```python
+```python
 g.bind("foaf", FOAF)
 g.bind("xsd", XSD)
 ```
+
 This will allow the n-triples triple above to be serialised like this:
- ```python
+
+```python
 print(g.serialize(format="turtle"))
 ```
 

diff --git a/Taskfile.yml b/Taskfile.yml
@@ -170,19 +170,19 @@ tasks:
     desc: Clean generated documentation
     cmds:
       - task: _rimraf
-        vars: { RIMRAF_TARGET: "docs/_build/" }
+        vars: { RIMRAF_TARGET: "site/" }
 
   docs:
     desc: Build documentation
     cmds:
       - echo "PYTHONPATH=${PYTHONPATH}"
-      - "{{.VENV_PYTHON}} -m sphinx.cmd.build -T -W -b html -d docs/_build/doctree docs docs/_build/html {{.CLI_ARGS}}"
+      - "{{.VENV_PYTHON}} -m mkdocs build {{.CLI_ARGS}}"
 
   docs:live-server:
     desc: Run a live server on generated docs
     cmds:
       - 'echo "NOTE: Docs must be built for this to work"'
-      - npx -p live-server live-server docs/_build/html/ {{.CLI_ARGS}}
+      - npx -p live-server live-server site/ {{.CLI_ARGS}}
 
   default:
     desc: Run validate
@@ -272,7 +272,7 @@ tasks:
 
   pip-compile:
     cmds:
-      - cmd: "{{.PIP_COMPILE}} --quiet --annotate --emit-options --resolver=backtracking {{.CLI_ARGS}}"
+      - cmd: "{{.PIP_COMPILE}} --quiet --annotate --emit-options --no-strip-extras --resolver=backtracking {{.CLI_ARGS}}"
 
   docker:prepare:
     cmds:
@@ -356,7 +356,7 @@ tasks:
         cd var/test-sdist/rdflib-*
         poetry install
         poetry run mypy --show-error-context --show-error-codes -p rdflib
-        poetry run sphinx-build -T -W -b html -d docs/_build/doctree docs docs/_build/html
+        poetry run mkdocs build
         poetry run pytest
 
   test:no_internet:

diff --git a/admin/get_merged_prs.py b/admin/get_merged_prs.py
@@ -5,7 +5,7 @@
 import urllib.request
 
 # https://api.github.com/search/issues?q=repo:rdflib/rdflib+is:pr+merged:%3E=2023-08-02&per_page=300&page=1
-LAST_RELEASE_DATE = "2024-10-17"
+LAST_RELEASE_DATE = "2024-10-29"
 ISSUES_URL = "https://api.github.com/search/issues"
 ITEMS = []
 PAGE = 1
@@ -23,7 +23,11 @@
     print(f"Getting {url}")
     with urllib.request.urlopen(url) as response:
         response_text = response.read()
-        link_headers = response.info()["link"].split(",") if response.info()["link"] is not None else None
+        link_headers = (
+            response.info()["link"].split(",")
+            if response.info()["link"] is not None
+            else None
+        )
 
     json_data = json.loads(response_text)
     ITEMS.extend(json_data["items"])

diff --git a/devtools/constraints.min b/devtools/constraints.min
@@ -2,10 +2,11 @@
 # these versions. The file's extension (`.min`) is chosen to evade Dependabot
 # which operates on `*.{txt,in}` files.
 isodate==0.7.2; python_version < "3.11"
-pyparsing==2.1.0
+pyparsing==3.2.0
 importlib-metadata==4.0.0
 berkeleydb==18.1.2
 networkx==2.0
-html5rdf==1.2.0
-lxml==4.3.0
+html5rdf==1.2.1
+lxml==4.8.0; python_version < "3.11"
+lxml==4.9.3; python_version >= "3.11"
 orjson==3.9.14