Merge branch 'main' into aucampia/20230619T2345-remove_genid

.dockerignore

@@ -1,5 +1,6 @@
 .tox
 .venv
+.venv39
 .mypy_cache
 .pytest_cache
 .git

.github/PULL_REQUEST_TEMPLATE.md

@@ -58,7 +58,7 @@ unsure about them, submit your PR as is and ask for help.
   - [ ] Created an issue to discuss the change and get in-principle agreement.
   - [ ] Considered adding an example in `./examples`.
 - If the change has a potential impact on users of this project:
-  <!-- This can be removed if the changed does affect users of this project. -->
+  <!-- This can be removed if the change does not affect users of this project. -->
   - [ ] Added or updated tests that fail without the change.
   - [ ] Updated relevant documentation to avoid inaccuracies.
   - [ ] Considered adding additional documentation.

.github/dependabot.yml

@@ -13,6 +13,15 @@ updates:
         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.
+      - dependency-name: setuptools
+        versions:
+          - ">=72.0"
+      - dependency-name: types-setuptools
+        versions:
+          - ">=72.0"
       # Ignore all black updates, because we use a pinned version we don't want to change
       - dependency-name: black
       # Ignore types-setuptools patch-level updates, because they issue too many!

.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

.gitignore

@@ -139,6 +139,7 @@ celerybeat.pid
 # Environments
 .env
 .venv
+.venv39
 env/
 venv/
 ENV/

.pre-commit-config.yaml

@@ -1,27 +1,27 @@
 ---
 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.7.2
     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: 1.8.4
     hooks:
     - id: poetry-check
     - id: poetry-lock

.readthedocs.yaml

@@ -21,7 +21,7 @@ build:
     # the readthedocs environment.
     - pip install -r devtools/requirements-poetry.in
     post_install:
-    - poetry export --only=main --only=docs --extras=html -o requirements.txt
+    - 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)"