Merge branch 'main' into dependabot/docker/docker/latest/library/python-3.13.7-slim

Author: nicholascar

.github/workflows/test-report.yml

@@ -11,14 +11,14 @@ jobs:
       checks: write
       statuses: write
     steps:
-      - uses: dorny/test-reporter@v1
+      - uses: dorny/test-reporter@v2
         with:
           artifact: /(.*)-mypy-junit-xml$/
           name: mypy report
           path: "*.xml"
           reporter: java-junit
           fail-on-error: "false"
-      - uses: dorny/test-reporter@v1
+      - uses: dorny/test-reporter@v2
         with:
           artifact: /(.*)-pytest-junit-xml$/
           name: pytest report

.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.8.6
+    rev: v0.11.0
     hooks:
       - id: ruff
         args: ["--fix"]
@@ -21,9 +21,8 @@ repos:
       require_serial: true
       args: ["."]
   - repo: https://github.com/python-poetry/poetry
-    rev: 2.0.0
+    rev: 2.1.1
     hooks:
     - id: poetry-check
-    - id: poetry-lock
       # sadly `--no-update` does not work on pre-commit.ci
-
+      args: ["--lock"]

CHANGELOG.md

@@ -1,3 +1,46 @@
+## 2025-03-29 RELEASE 7.1.4
+
+A tidy-up release with no major updates over 7.1.3. This may be the last 7.x 
+release as we move to a version 8 with breaking changes to Dataset and a few
+APIs.
+
+Interesting PRs merged:
+
+* 2025-03-24 - remove old hacks against 2to3
+  [PR #3095](https://github.com/RDFLib/rdflib/pull/3095)
+* 2025-03-24 - Allow multi subjects & objects in graph funcs
+  [PR #3086](https://github.com/RDFLib/rdflib/pull/3086)
+* 2025-03-24 - Reduce test warnings
+  [PR #3085](https://github.com/RDFLib/rdflib/pull/3085)
+* 2025-03-22 - Downgrade log message about plugin
+  [PR #3063](https://github.com/RDFLib/rdflib/pull/3063)
+* 2025-03-22 - remove old hacks against 2to3
+  [PR #3076](https://github.com/RDFLib/rdflib/pull/3076)
+* 2025-03-22 - Cope with Namespace annotations in Python 3.14
+  [PR #3084](https://github.com/RDFLib/rdflib/pull/3084)
+* 2025-01-18 - small docco update
+  [PR #3053](https://github.com/RDFLib/rdflib/pull/3053)
+
+... and lots of boring dependency bump PRs merged!
+
+## 2025-01-17 RELEASE 7.1.3
+
+A fix-up release that re-adds support for Python 3.8 after it was accidentally 
+removed in Release 7.1.2.
+
+This release cherrypicks many additions to 7.1.2 added to 7.1.1 but leaves out 
+typing changes that are not compatible
+with Python 3.8.
+
+Also not carried over from 7.1.2 is the change from Poetry 1.x to 2.0.
+
+Included are PRs such as _Defined Namespace warnings fix_, _sort longturtle 
+blank nodes_, _deterministic longturtle serialisation_ and _Dataset documentation 
+improvements_.
+
+For the full list of included PRs, see the preparatory PR: 
+<https://github.com/RDFLib/rdflib/pull/3036>.
+
 ## 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:
@@ -54,7 +97,6 @@ Merged PRs:
 * 2024-10-23 - build(deps-dev): bump ruff from 0.6.9 to 0.7.0
   [PR #2942](https://github.com/RDFLib/rdflib/pull/2942)
 
-
 ## 2024-10-17 RELEASE 7.1.0
 
 This minor release incorporates just over 100 substantive PRs - interesting 

CITATION.cff

@@ -72,7 +72,7 @@ authors:
 - family-names: "Stuart"
   given-names: "Veyndan"
 title: "RDFLib"
-version: 7.1.2
-date-released: 2025-01-10
+version: 7.1.4
+date-released: 2025-03-29
 url: "https://github.com/RDFLib/rdflib"
 doi: 10.5281/zenodo.6845245

README.md

@@ -18,9 +18,10 @@
 
 RDFLib is a pure Python package for working with [RDF](http://www.w3.org/RDF/). RDFLib contains most things you need to work with RDF, including:
 
-* parsers and serializers for RDF/XML, N3, NTriples, N-Quads, Turtle, TriX, Trig and JSON-LD
+* parsers and serializers for RDF/XML, N3, NTriples, N-Quads, Turtle, TriX, Trig, JSON-LD and even HexTuples
 * a Graph interface which can be backed by any one of a number of Store implementations
-* store implementations for in-memory, persistent on disk (Berkeley DB) and remote SPARQL endpoints
+* Store implementations for in-memory, persistent on disk (Berkeley DB) and remote SPARQL endpoints
+    * additional Stores can be supplied via plugins 
 * a SPARQL 1.1 implementation - supporting SPARQL 1.1 Queries and Update statements
 * SPARQL function extension mechanisms
 
@@ -45,9 +46,12 @@ Help with maintenance of all of the RDFLib family of packages is always welcome
 
 * `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.3` current stable release, small improvements to 7.1.1
+* `7.1.2` previously deleted release
 * `7.1.1` previous stable release
     * see <https://github.com/RDFLib/rdflib/releases/tag/7.1.1>
+* `7.0.0` previous stable release, supports Python 3.8.1+ only.
+    * see [Releases](https://github.com/RDFLib/rdflib/releases)
 * `6.x.y` supports Python 3.7+ only. Many improvements over 5.0.0
     * 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).
@@ -70,8 +74,6 @@ 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.2, see the ``CHANGELOG.md`` file for what's new in this release.
-
 ### Installation of the current main branch (for developers)
 
 With *pip* you can also install rdflib from the git repository with one of the following options:

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-29"
+LAST_RELEASE_DATE = "2025-01-18"
 ISSUES_URL = "https://api.github.com/search/issues"
 ITEMS = []
 PAGE = 1

examples/datasets.py

@@ -1,5 +1,5 @@
 """
-This file contains a number of common tasks using the RDFLib Dataset class.
+This module contains a number of common tasks using the RDFLib Dataset class.
 
 An RDFLib Dataset is an object that stores multiple Named Graphs - instances of RDFLib
 Graph identified by IRI - within it and allows whole-of-dataset or single Graph use.
@@ -10,11 +10,11 @@
 There is an older implementation of a Dataset-like class in RDFLib < 7.x called
 ConjunctiveGraph that is now deprecated.
 
-Sections in this file:
+Sections in this module:
 
-1. Creating & Adding
-2. Looping & Counting
-3. Manipulating Graphs
+1. Creating & Growing Datasets
+2. Looping & Counting triples/quads in Datasets
+3. Manipulating Graphs with Datasets
 """
 
 from rdflib import Dataset, Graph, Literal, URIRef

examples/jsonld_serialization.py

@@ -1,24 +1,35 @@
 """
-JSON-LD is "A JSON-based Serialization for Linked Data" (https://www.w3.org/TR/json-ld/) that RDFLib implements for RDF serialization.
+JSON-LD is "A JSON-based Serialization for Linked Data" (https://www.w3.org/TR/json-ld/)
+that RDFLib implements for RDF serialization.
 
-This file demonstrated some of the JSON-LD things you can do with RDFLib. Parsing & serializing so far. More to be added later.
+This file demonstrated some of the JSON-LD things you can do with RDFLib. Parsing &
+serializing so far. More to be added later.
 
 
 Parsing
 -------
-There are a number of "flavours" of JSON-LD - compact and verbose etc. RDFLib can parse all of these in a normal RDFLib way.
+
+There are a number of "flavours" of JSON-LD - compact and verbose etc. RDFLib can parse
+all of these in a normal RDFLib way.
 
 
 Serialization
 -------------
-JSON-LD has a number of options for serialization - more than other RDF formats. For example, IRIs within JSON-LD can be compacted down to CURIES when a "context" statment is added to the JSON-LD data that maps identifiers - short codes - to IRIs and namespace IRIs like this:
 
-# here the short code "dcterms" is mapped to the IRI http://purl.org/dc/terms/ and "schema" to https://schema.org/, as per RDFLib's in-build namespace prefixes
+JSON-LD has a number of options for serialization - more than other RDF formats. For
+example, IRIs within JSON-LD can be compacted down to CURIES when a "context" statement
+is added to the JSON-LD data that maps identifiers - short codes - to IRIs and namespace
+IRIs like this:
 
-"@context": {
-    "dct": "http://purl.org/dc/terms/",
-    "schema": "https://schema.org/"
-}
+.. code-block:: json
+
+    "@context": {
+        "dcterms": "http://purl.org/dc/terms/",
+        "schema": "https://schema.org/"
+    }
+
+Here the short code "dcterms" is mapped to the IRI http://purl.org/dc/terms/ and
+"schema" to https://schema.org/, as per RDFLib's in-build namespace prefixes.
 """
 
 # import RDFLib and other things

rdflib/__init__.py

@@ -54,7 +54,7 @@
 __docformat__ = "restructuredtext en"
 
 __version__: str = _DISTRIBUTION_METADATA["Version"]
-__date__ = "2025-01-10"
+__date__ = "2025-03-29"
 
 __all__ = [
     "URIRef",

rdflib/extras/shacl.py

@@ -15,6 +15,9 @@
     from rdflib.graph import _ObjectType
     from rdflib.term import IdentifiedNode
 
+if TYPE_CHECKING:
+    from rdflib.term import IdentifiedNode
+
 
 class SHACLPathError(Exception):
     pass