aucampia/20230706T2301 expected outcome

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 <!--
 Thank you for your contribution to this project. This project has no formal
-funding or full-time maintainers and relies entirely on independent
+funding or full-time maintainers, and relies entirely on independent
 contributors to keep it alive and relevant.
 
 This pull request template includes some guidelines intended to help
@@ -15,23 +15,25 @@ and ask.
 More detailed guidelines for pull requests are provided in our [developers
 guide](https://github.com/RDFLib/rdflib/blob/main/docs/developers.rst).
 
-As a reminder, PRs that are smaller in size and scope will be reviewed and
-merged quicker, so please consider if your PR could be split up into more than
-one independent part before submitting it, no PR is too small. The maintainers
-of this project may also split up larger PRs into smaller more manageable PRs
-if they deem it necessary.
+PRs that are smaller in size and scope will be reviewed and merged quicker, so
+please consider if your PR could be split up into more than one independent part
+before submitting it, no PR is too small. The maintainers of this project may
+also split up larger PRs into smaller, more manageable PRs, if they deem it
+necessary.
 
-PRs should be reviewed and approved by at least two people other than the
-author using GitHub's review system before being merged. Reviews are open to
-anyone, so please consider reviewing other open pull requests as this will also
-free up the capacity required for your PR to be reviewed.
+PRs should be reviewed and approved by at least two people other than the author
+using GitHub's review system before being merged. This is less important for bug
+fixes and changes that don't impact runtime behaviour, but more important for
+changes that expand the RDFLib public API. Reviews are open to anyone, so please
+consider reviewing other open pull requests, as this will also free up the
+capacity required for your PR to be reviewed.
 -->
 
 # Summary of changes
 
 <!--
-Briefly explain what changes the pull request is making and why. Ideally this
-should cover all changes in the pull request as the changes will be reviewed
+Briefly explain what changes the pull request is making and why. Ideally, this
+should cover all changes in the pull request, as the changes will be reviewed
 against this summary to ensure that the PR does not include unintended changes.
 
 Please also explicitly state if the PR makes any changes that are not backwards
@@ -49,13 +51,17 @@ unsure about them, submit your PR as is and ask for help.
 
 - [ ] Checked that there aren't other open pull requests for
   the same change.
-- [ ] Added tests for any changes that have a runtime impact.
 - [ ] Checked that all tests and type checking passes.
-- For changes that have a potential impact on users of this project:
+- If the change adds new features or changes the RDFLib public API:
+  <!-- This can be removed if no new features are added and the RDFLib public API is
+  not changed. -->
+  - [ ] 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. -->
+  - [ ] Added or updated tests that fail without the change.
   - [ ] Updated relevant documentation to avoid inaccuracies.
   - [ ] Considered adding additional documentation.
-  - [ ] Considered adding an example in `./examples` for new features.
-  - [ ] Considered updating our changelog (`CHANGELOG.md`).
 - [ ] Considered granting [push permissions to the PR branch](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork),
   so maintainers can fix minor issues and keep your PR up to date.
 

.github/workflows/docker-images.yaml

@@ -44,10 +44,9 @@ jobs:
         uses: arduino/setup-task@v1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Python Poetry Action
-        uses: abatilo/[email protected]
-        with:
-          poetry-version: 1.4.0
+      - name: Install poetry
+        run: |
+          pip install -r devtools/requirements-poetry.in
       - name: Build images
         shell: bash
         run: |
@@ -70,10 +69,9 @@ jobs:
         uses: arduino/setup-task@v1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Python Poetry Action
-        uses: abatilo/[email protected]
-        with:
-          poetry-version: 1.4.0
+      - name: Install poetry
+        run: |
+          pip install -r devtools/requirements-poetry.in
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:

.github/workflows/validate.yaml

@@ -25,54 +25,54 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
         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.7"
+          - python-version: "3.8"
             os: ubuntu-latest
             extensive-tests: true
             TOXENV_SUFFIX: "-docs"
-          - python-version: "3.7"
+          - python-version: "3.8"
             os: ubuntu-latest
             extensive-tests: true
             suffix: "-min"
             TOXENV_SUFFIX: "-min"
-          - python-version: "3.8"
+          - python-version: "3.9"
             os: ubuntu-latest
             TOX_EXTRA_COMMAND: "- isort --check-only --diff ."
             TOXENV_SUFFIX: "-docs"
-          - python-version: "3.9"
+          - python-version: "3.10"
             os: ubuntu-latest
             TOX_EXTRA_COMMAND: "- black --check --diff ./rdflib"
             TOXENV_SUFFIX: "-lxml"
-          - python-version: "3.10"
-            os: ubuntu-latest
-            TOX_EXTRA_COMMAND: "flake8 --exit-zero rdflib"
-            TOXENV_SUFFIX: "-docs"
           - 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
       - name: Cache XDG_CACHE_HOME
         uses: actions/cache@v3
         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') }}
+          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
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Python Poetry Action
-        uses: abatilo/[email protected]
-        with:
-          poetry-version: 1.4.0
+      - name: Install poetry
+        run: |
+          pip install -r devtools/requirements-poetry.in
       - uses: actions/setup-java@v3
         if: ${{ matrix.extensive-tests }}
         with:
@@ -82,11 +82,15 @@ jobs:
         uses: arduino/setup-task@v1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Run preparation
+        if: ${{ matrix.PREPARATION }}
+        shell: bash
+        run: |
+          ${{ matrix.PREPARATION }}
       - name: Run validation
         shell: bash
         run: |
           task \
-            TOX_EXTRA_COMMAND="${{ matrix.TOX_EXTRA_COMMAND }}" \
             OS=${{ matrix.os }} \
             MATRIX_SUFFIX=${{ matrix.suffix }} \
             EXTENSIVE=${{ matrix.extensive-tests || 'false' }} \
@@ -96,6 +100,9 @@ jobs:
             gha:validate
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          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
         if: ${{ (success() || failure()) }}
         with:
@@ -122,18 +129,17 @@ jobs:
         uses: actions/cache@v3
         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') }}
+          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
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Python Poetry Action
-        uses: abatilo/[email protected]
-        with:
-          poetry-version: 1.4.0
+      - name: Install poetry
+        run: |
+          pip install -r devtools/requirements-poetry.in
       - name: Install Task
         uses: arduino/setup-task@v1
         with:

.gitignore

@@ -1,3 +1,4 @@
+.flakeheaven_cache/
 RDFLib.sublime-project
 /docs/_build/
 RDFLib.sublime-workspace

.mailmap

@@ -0,0 +1,101 @@
+Aayush Gupta <[email protected]> aayush17002 <[email protected]>
+Aditi Sejal <[email protected]> asejal <[email protected]>
+Aditya Bhadoo <[email protected]> bhadoo-aditya <[email protected]>
+Akash Sharma <[email protected]> Akash-Sharma-1 <[email protected]>
+Artem Revenko <[email protected]> artreven <[email protected]>
+Ashley Sommer <[email protected]> Ashley Sommer <[email protected]>
+Ashley Sommer <[email protected]> Ashley Sommer <[email protected]>
+Arushi Chauhan <[email protected]> arushi019 <[email protected]>
+Bruno Cuconato <[email protected]> bruno cuconato <[email protected]>
+Christian Amsüss <[email protected]> chrysn <[email protected]>
+Cliff Xuan <[email protected]> cliff xuan <[email protected]>
+Camille Maumet <[email protected]> cmaumet <[email protected]>
+Chimezie Ogbuji <devnull@localhost> chimezie <devnull@localhost>
+Conrad Leonard <[email protected]> delocalizer <[email protected]>
+Cory Dodt <[email protected]> corydodt <devnull@localhost>
+Daniel Krech <[email protected]> convert-repo <devnull@localhost>
+Daniel Krech <[email protected]> eikeon <devnull@localhost>
+Daniel Krech <[email protected]> [email protected] <[email protected]>
+Daniel Krech <[email protected]> testing <devnull@localhost>
+Daniel Krech <[email protected]> unknown <devnull@localhost>
+Dmitriy Bastrak <[email protected]> Dmitriy <[email protected]>
+Drew Perttula <[email protected]> drewp <devnull@localhost>
+Drew Perttula <[email protected]> drewpca <devnull@localhost>
+Ed Summers <[email protected]> ed.summers <devnull@localhost>
+Edmond Chuc <[email protected]> Edmond <[email protected]>
+Edmond Chuc <[email protected]> Edmond Chuc <[email protected]>
+Edmond Chuc <[email protected]> Edmond Chuc <[email protected]>
+Edmond Chuc <[email protected]> Edmond Chuc <[email protected]>
+Elias Torres <[email protected]> eliast <devnull@localhost>
+Filip Kovacevic <[email protected]> Filip Kovacevic <[email protected]>
+Fredrik Aschehoug <[email protected]> fredrik-aschehoug <[email protected]>
+Gerhard Weis <[email protected]> Gerhard Weis <[email protected]>
+Gerhard Weis <[email protected]> Gerhard Weis <[email protected]>
+Graham Higgins <[email protected]> gjh <devnull@localhost>
+Graham Higgins <[email protected]> gjhiggins <devnull@localhost>
+Graham Higgins <[email protected]> Graham Higgins <[email protected]>
+Graham Higgins <[email protected]> Graham Higgins <[email protected]>
+Graham Higgins <[email protected]> Graham Higgins <[email protected]>
+Gunnar Aastrand Grimnes <[email protected]> gromgull <[email protected]>
+Gunnar Aastrand Grimnes <[email protected]> gromgull <devnull@localhost>
+Gunnar Aastrand Grimnes <[email protected]> Gunnar Aastrand Grimnes <[email protected]>
+Harold Solbrig <[email protected]> hsolbrig <[email protected]>
+Harold Solbrig <[email protected]> hsolbrig <[email protected]>
+Hanno Jung <[email protected]> angus <[email protected]>
+Jeroen van der Ham <[email protected]> jeroenh <devnull@localhost>
+Jerven Bolleman <[email protected]> Jerven bolleman <[email protected]>
+Jim Man <[email protected]> jimman2003 <[email protected]>
+Jamie McCusker <[email protected]> Jim McCusker <[email protected]>
+Jamie McCusker <[email protected]> Ubuntu <[email protected]>
+John L. Clark <devnull@localhost> John.L.Clark <devnull@localhost>
+Jörn Hees <[email protected]> Jörn Hees <[email protected]>
+Jörn Hees <[email protected]> Joern Hees <[email protected]>
+Jörn Hees <[email protected]> Jörn Hees <[email protected]>
+Jörn Hees <[email protected]> Joern Hees <[email protected]>
+Jörn Hees <[email protected]> Jörn Hees <[email protected]>
+Josh Moore <[email protected]> jmoore <[email protected]>
+Kern Cece <[email protected]> kernc <[email protected]>
+Kushagr Arora <[email protected]> kushagr08 <[email protected]>
+Łukasz Jancewicz <[email protected]> DzinX <[email protected]>
+Mark Hedley <[email protected]> marqh <[email protected]>
+Mark van der Pas <[email protected]> gitmpje <[email protected]>
+Mark Watts <[email protected]> Mark Watts <[email protected]>
+Martin van der Werff <[email protected]> Martin van der Werff <[email protected]>
+Maurizio Nagni <[email protected]> kusamau <[email protected]>
+Michel Pelletier <[email protected]> michel <devnull@localhost>
+Mikael Nilsson <[email protected]> mikael <devnull@localhost>
+Nathan Maynes <[email protected]> Nathan M <[email protected]>
+Nicholas J. Car <[email protected]> Nicholas Car <[email protected]>
+Nicholas J. Car <[email protected]> Nicholas Car <[email protected]>
+Nicholas J. Car <[email protected]> nicholascar <[email protected]>
+Niklas Lindström <[email protected]> lindstream <devnull@localhost>
+Niklas Lindström <[email protected]> Niklas Lindstrom <[email protected]>
+Olivier Grisel <[email protected]> ogrisel <devnull@localhost>
+Filip Kovacevic <[email protected]> GreenfishK <[email protected]>
+Ralf Grubenmann <[email protected]> Ralf Grubenmann <[email protected]>
+Remi Chateauneu <[email protected]> Primhill Computers <[email protected]>
+Richard Wallis <[email protected]> dataliberate <[email protected]>
+Ritam Biswas <[email protected]> devrb <[email protected]>
+Rory McCann <[email protected]> Rory McCann <[email protected]>
+Rouzbeh Asghari <[email protected]> rozbeh <[email protected]>
+Sean Fern <[email protected]> gsf747 <devnull@localhost>
+Shawn Brown <devnull@localhost> shawnb <devnull@localhost>
+Shreyas Nagare <[email protected]> shreyasnagare <[email protected]>
+Stephen Thorne <[email protected]> [email protected] <[email protected]>
+Thomas Bettler <[email protected]> t0b3 <[email protected]>
+Thomas Bettler <[email protected]> t0b3 <[email protected]>
+Thomas Köner-Daikan <[email protected]> wssbck <[email protected]>
+Thomas Kluyver <[email protected]> [email protected] <[email protected]>
+Thomas Tanon <[email protected]> Tpt <[email protected]>
+Thomas Tanon <[email protected]> Thomas Tanon <[email protected]>
+Timo Homburg <[email protected]> Timo <[email protected]>
+Tom Baker <[email protected]> tombaker <[email protected]>
+Veyndan Stuart <[email protected]> veyndan <[email protected]>
+Vigten Stain <[email protected]> vigten <[email protected]>
+Wataru Haruna <[email protected]> eggplants <[email protected]>
+William Waites <[email protected]> William Waites <[email protected]>
+William Waites <[email protected]> wwaites <[email protected]>
+William Waites <[email protected]> [email protected] <[email protected]>
+Whit Morriss <[email protected]> whit <devnull@localhost>
+Zach Lûster <[email protected]> kernc <[email protected]>
+Zach Lûster <[email protected]> Kernc <[email protected]>

.pre-commit-config.yaml

@@ -18,14 +18,14 @@ repos:
   - 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.1.0:refs/tags/23.1.0'
+    rev: 'refs/tags/23.3.0:refs/tags/23.3.0'
     hooks:
     - id: black
       pass_filenames: false
       require_serial: true
       args: ["."]
   - repo: https://github.com/python-poetry/poetry
-    rev: 1.4.0
+    rev: 1.5.0
     hooks:
     - id: poetry-check
     - id: poetry-lock

.readthedocs.yaml

@@ -24,11 +24,6 @@ build:
     - poetry config virtualenvs.create false
     - poetry install --only=main --only=docs --extras=html
     - poetry env info
-    # This will patch Sphinx to a later version than is in poetry.lock so that
-    # we build with a more up to date Sphinx. This should be eliminated when
-    # possible in favor of having a more up to date Sphinx in poetry.lock.
-    - pip install -r devtools/requirements-rtd.txt
-
 
 sphinx:
   fail_on_warning: true