Merge branch 'main' into deskolemization-bug

Author: edmondchuc

.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.

.github/workflows/docker-images.yaml

@@ -37,7 +37,7 @@ jobs:
       packages: read
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 1
       - name: Install Task
@@ -62,7 +62,7 @@ jobs:
       contents: read
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 1
       - name: Install Task

.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

.github/workflows/validate.yaml

@@ -53,14 +53,14 @@ jobs:
             TOXENV_SUFFIX: "-docs"
             PREPARATION: "sudo apt-get install -y firejail"
             extensive-tests: true
-            TOX_TEST_HARNESS: "firejail --net=none --"
+            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
+      - uses: actions/checkout@v5
       - name: Cache XDG_CACHE_HOME
         uses: actions/cache@v4
         with:
@@ -70,13 +70,13 @@ jobs:
             ${{ github.job }}-xdg-v1-${{ matrix.os }}-${{ matrix.python-version }}-
             ${{ github.job }}-xdg-v1-${{ matrix.os }}-
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install poetry
         run: |
           pip install -r devtools/requirements-poetry.in
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         if: ${{ matrix.extensive-tests }}
         with:
           distribution: "temurin"
@@ -127,7 +127,7 @@ jobs:
           - task: "gha:lint"
             python-version: 3.9
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Cache XDG_CACHE_HOME
         uses: actions/cache@v4
         with:
@@ -137,7 +137,7 @@ jobs:
             ${{ github.job }}-xdg-v1-${{ matrix.os }}-${{ matrix.python-version }}-
             ${{ github.job }}-xdg-v1-${{ matrix.os }}-
       - name: Set up Python ${{env.DEFAULT_PYTHON}}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install poetry

.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

.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.13.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"]

.readthedocs.yaml

@@ -9,12 +9,11 @@ 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,8 +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:
-  configuration: docs/conf.py
-  fail_on_warning: true
+mkdocs:
+  configuration: mkdocs.yml

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

MANIFEST.in

@@ -9,4 +9,5 @@ recursive-include examples *.py
 graft test
 graft docs
 prune docs/_build
+prune site/
 global-exclude *.pyc *$py.class