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

# Conflicts: # rdflib/graph.py # rdflib/term.py
RDFLib · Jul 29, 2024 · 2d93b92 · 2d93b92
2 parents 63bd1d2 + 563dfcc
commit 2d93b92
Show file tree

Hide file tree

Showing 360 changed files with 11,418 additions and 10,066 deletions.
diff --git a/.flakeheaven.baseline b/.flakeheaven.baseline
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,11 +5,19 @@ updates:
     schedule:
       interval: weekly
     open-pull-requests-limit: 10
+    # todo: change this to widen when Dependabot adds widen back to Pip ecosystem
+    # see https://github.com/dependabot/dependabot-core/pull/10194
+    versioning-strategy: auto
     ignore:
       - dependency-name: sphinx
         versions:
           - 3.4.3
           - 3.5.2
+      # 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!
+      - dependency-name: types-setuptools
+        update-types: ["version-update:semver-patch"]
   - package-ecosystem: github-actions
     directory: "/"
     schedule:
@@ -22,6 +30,7 @@ updates:
     directory: docker/latest/
     schedule:
       interval: weekly
+    versioning-strategy: auto
   - package-ecosystem: docker
     directory: docker/unstable/
     schedule:
@@ -30,3 +39,4 @@ updates:
     directory: devtools/
     schedule:
       interval: weekly
+    versioning-strategy: auto
diff --git a/.github/workflows/docker-images.yaml b/.github/workflows/docker-images.yaml
@@ -37,11 +37,11 @@ jobs:
       packages: read
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: Install Task
-        uses: arduino/setup-task@v1
+        uses: arduino/setup-task@v2
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Install poetry
@@ -62,18 +62,18 @@ jobs:
       contents: read
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: Install Task
-        uses: arduino/setup-task@v1
+        uses: arduino/setup-task@v2
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Install poetry
         run: |
           pip install -r devtools/requirements-poetry.in
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml
@@ -38,48 +38,47 @@ jobs:
           - python-version: "3.8"
             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"
             os: ubuntu-latest
-            TOX_EXTRA_COMMAND: "- isort --check-only --diff ."
             TOXENV_SUFFIX: "-docs"
           - python-version: "3.10"
             os: ubuntu-latest
             TOX_EXTRA_COMMAND: "- black --check --diff ./rdflib"
             TOXENV_SUFFIX: "-lxml"
           - python-version: "3.11"
             os: ubuntu-latest
-            TOX_EXTRA_COMMAND: "flake8 --exit-zero rdflib"
             TOXENV_SUFFIX: "-docs"
             PREPARATION: "sudo apt-get install -y firejail"
             extensive-tests: true
             TOX_TEST_HARNESS: "firejail --net=none --"
             TOX_PYTEST_EXTRA_ARGS: "-m 'not webtest'"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Cache XDG_CACHE_HOME
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ env.XDG_CACHE_HOME }}
           key: ${{ github.job }}-xdg-v1-${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('**/pyproject.toml', '**/poetry.lock', '**/with-fuseki.sh', '**/*requirements*.txt', '**/*requirements*.in') }}
           restore-keys: |
             ${{ 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@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install poetry
         run: |
           pip install -r devtools/requirements-poetry.in
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         if: ${{ matrix.extensive-tests }}
         with:
           distribution: "temurin"
           java-version: "17"
       - name: Install Task
-        uses: arduino/setup-task@v1
+        uses: arduino/setup-task@v2
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Run preparation
@@ -103,12 +102,12 @@ jobs:
           TOX_PYTEST_EXTRA_ARGS: ${{ matrix.TOX_PYTEST_EXTRA_ARGS }}
           TOX_TEST_HARNESS: ${{ matrix.TOX_TEST_HARNESS }}
           TOX_EXTRA_COMMAND: ${{ matrix.TOX_EXTRA_COMMAND }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: ${{ (success() || failure()) }}
         with:
           name: ${{ matrix.python-version }}-${{ matrix.os }}${{matrix.suffix}}-mypy-junit-xml
           path: test_reports/${{ matrix.python-version }}-${{ matrix.os }}${{matrix.suffix}}-mypy-junit.xml
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: ${{ (success() || failure()) }}
         with:
           name: ${{ matrix.python-version }}-${{ matrix.os }}${{matrix.suffix}}-pytest-junit-xml
@@ -121,27 +120,27 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - task: "gha:flake8"
+          - task: "gha:lint"
             python-version: 3.8
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Cache XDG_CACHE_HOME
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ env.XDG_CACHE_HOME }}
           key: ${{ github.job }}-xdg-v1-${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('**/pyproject.toml', '**/poetry.lock', '**/with-fuseki.sh', '**/*requirements*.txt', '**/*requirements*.in') }}
           restore-keys: |
             ${{ 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@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install poetry
         run: |
           pip install -r devtools/requirements-poetry.in
       - name: Install Task
-        uses: arduino/setup-task@v1
+        uses: arduino/setup-task@v2
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Run task

diff --git a/.mailmap b/.mailmap
@@ -65,9 +65,10 @@ Maurizio Nagni <m.nagni@gmail.com> kusamau <m.nagni@gmail.com>
 Michel Pelletier <michel@graphegon.com> michel <devnull@localhost>
 Mikael Nilsson <mikaeln@google.com> mikael <devnull@localhost>
 Nathan Maynes <nathanmaynes@gmail.com> Nathan M <nathanmaynes@gmail.com>
-Nicholas J. Car <nicholas.car@surroundaustralia.com> Nicholas Car <nicholas.car@csiro.au>
-Nicholas J. Car <nicholas.car@surroundaustralia.com> Nicholas Car <nick@kurrawong.net>
-Nicholas J. Car <nicholas.car@surroundaustralia.com> nicholascar <nicholas.car@surroundaustralia.com>
+Nicholas J. Car <nick@kurrawong.ai> Nicholas Car <nicholas.car@csiro.au>
+Nicholas J. Car <nick@kurrawong.ai> Nicholas Car <nick@kurrawong.net>
+Nicholas J. Car <nick@kurrawong.ai> nicholascar <nicholas.car@surroundaustralia.com>
+Nicholas J. Car <nick@kurrawong.ai> Nicholas Car <nicholas.car@ga.gov.au>
 Niklas Lindström <lindstream@gmail.com> lindstream <devnull@localhost>
 Niklas Lindström <lindstream@gmail.com> Niklas Lindstrom <lindstream@gmail.com>
 Olivier Grisel <olivier.grisel@ensta.org> ogrisel <devnull@localhost>
@@ -98,4 +99,4 @@ William Waites <ww@styx.org> wwaites <ww@styx.org>
 William Waites <ww@styx.org> ww@epsilon.styx.org <ww@epsilon.styx.org>
 Whit Morriss <d.w.morriss@gmail.com> whit <devnull@localhost>
 Zach Lûster <kerncece@gmail.com> kernc <kerncece@gmail.com>
-Zach Lûster <kerncece@gmail.com> Kernc <kerncece@gmail.com>
+Zach Lûster <kerncece@gmail.com> Kernc <kerncece@gmail.com>
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,26 +6,22 @@ ci:
 
 # https://pre-commit.com/#adding-pre-commit-plugins-to-your-project
 repos:
-  - repo: https://github.com/pycqa/isort
-    rev: 5.11.5
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # WARNING: Ruff version should be the same as in `pyproject.toml`
+    rev: v0.5.4
     hooks:
-    - id: isort
-      # This is here to defer file selection to isort which will do it based on
-      # black config.
-      pass_filenames: false
-      require_serial: true
-      args: ["."]
-  - repo: https://github.com/psf/black
-    # WARNING: version should be the same as in `pyproject.toml`
-    # Using git ref spec because of https://github.com/psf/black/issues/2493
-    rev: 'refs/tags/23.3.0:refs/tags/23.3.0'
+      - 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"
     hooks:
     - id: black
       pass_filenames: false
       require_serial: true
       args: ["."]
   - repo: https://github.com/python-poetry/poetry
-    rev: 1.5.0
+    rev: 1.8.3
     hooks:
     - id: poetry-check
     - id: poetry-lock

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -21,9 +21,10 @@ build:
     # the readthedocs environment.
     - pip install -r devtools/requirements-poetry.in
     post_install:
-    - poetry config virtualenvs.create false
-    - poetry install --only=main --only=docs --extras=html
-    - poetry env info
+    - poetry export --only=main --only=docs --extras=html -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