Merge branch '7.x' into main

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.5.4
+    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: 1.8.3
+    rev: 2.1.1
     hooks:
     - id: poetry-check
-    - id: poetry-lock
       # sadly `--no-update` does not work on pre-commit.ci
-      args: ["--check"]
+      args: ["--lock"]

.readthedocs.yaml

@@ -27,4 +27,5 @@ build:
     - python -c "from rdflib import Graph; print(Graph)"
 
 sphinx:
+  configuration: docs/conf.py
   fail_on_warning: true

CHANGELOG.md

@@ -1,3 +1,28 @@
+## 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 

README.md

@@ -42,7 +42,8 @@ Help with maintenance of all of the RDFLib family of packages is always welcome
 
 ## Versions & Releases
 
-* `main` branch in this repository is the current unstable release
+* `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.3` current stable release, small improvements to 7.1.1
 * `7.1.2` previously deleted release
 * `7.1.1` previous stable release

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

docker/latest/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/library/python:3.12.7-slim@sha256:af4e85f1cac90dd3771e47292ea7c8a9830abfabbe4faa5c53f158854c2e819d
+FROM docker.io/library/python:3.13.2-slim@sha256:ae9f9ac89467077ed1efefb6d9042132d28134ba201b2820227d46c9effd3174
 
 COPY docker/latest/requirements.txt /var/tmp/build/
 

docker/unstable/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/library/python:3.12.7-slim@sha256:af4e85f1cac90dd3771e47292ea7c8a9830abfabbe4faa5c53f158854c2e819d
+FROM docker.io/library/python:3.13.2-slim@sha256:8f3aba466a471c0ab903dbd7cb979abd4bda370b04789d25440cc90372b50e04
 
 # This file is generated from docker:unstable in Taskfile.yml
 COPY var/requirements.txt /var/tmp/build/

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rdflib"
-version = "7.1.4a"
+version = "7.1.4"
 description = """RDFLib is a Python library for working with RDF, \
 a simple yet powerful language for representing information."""
 authors = ["Daniel 'eikeon' Krech <[email protected]>"]