Skip to content

Merge 7-maintenance changes into main #3202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 41 commits into from
Sep 9, 2025
Merged

Merge 7-maintenance changes into main #3202

merged 41 commits into from
Sep 9, 2025

Conversation

@edmondchuc
Copy link
Contributor

@edmondchuc edmondchuc commented Sep 4, 2025 •
edited
Loading

Summary of changes

This PR integrates the recent features and bug fixes from 7-maintenance branch into main. This will be merged when the 7.2.0 version is released.

Many merge conflicts were resolved and all tests and checks are passing.

This PR supersedes #3199.

Checklist

  • Checked that there aren't other open pull requests for
    the same change.
  • Checked that all tests and type checking passes.
  • If the change adds new features or changes the RDFLib public API:
    • 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:
    • Added or updated tests that fail without the change.
    • Updated relevant documentation to avoid inaccuracies.
    • Considered adding additional documentation.
  • Considered granting push permissions to the PR branch,
    so maintainers can fix minor issues and keep your PR up to date.

edmondchuc and others added 30 commits January 16, 2025 17:29
@edmondchuc @nicholascar
@ashleysommer @dependabot @ajnelson-nist @joecrowleygaia @progval @jcbiddle @sandervd @mgberg
7.1.3 prep (#3036)
76a870c 
* 7.1.1 post release (#2953)

* Fix Black formatting in ./admin/get_merged_prs.py (#2954)

* build(deps-dev): bump ruff from 0.7.0 to 0.7.1 (#2955)

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.7.0 to 0.7.1.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.7.0...0.7.1)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ashley Sommer <ashleysommer@gmail.com>

* Fix defined namespace warnings (#2964)

* Fix defined namespace warnings

Current docs-generation tests are polluted by lots of warnings that occur when Sphinx tries to read various parts of DefinedNamespace.

* Fix tests that no longer need incorrect exceptions handled.

* fix black formatting in test file

* Undo typing changes, so this works on current pre-3.9 branch

* better handling for any/all double-underscore properties

* Don't include __slots__ in dir().

* test: earl test passing

* Annotate Serializer.serialize and descendants (#2970)

This patch aligns the type signatures on `Serializer` subclasses,
including renaming the arbitrary-keywords dictionary to always be
`**kwargs`.  This is in part to prepare for the possibility of adding
`*args` as a positional-argument delimiter.

References:
* #1890 (comment)

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>

* build(deps): bump orjson from 3.10.10 to 3.10.11 (#2966)

Bumps [orjson](https://github.com/ijl/orjson) from 3.10.10 to 3.10.11.
- [Release notes](https://github.com/ijl/orjson/releases)
- [Changelog](https://github.com/ijl/orjson/blob/master/CHANGELOG.md)
- [Commits](ijl/orjson@3.10.10...3.10.11)

---
updated-dependencies:
- dependency-name: orjson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump ruff from 0.7.1 to 0.7.2 (#2969)

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.7.1 to 0.7.2.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.7.1...0.7.2)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump ruff from 0.7.2 to 0.7.3 (#2979)

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.7.2 to 0.7.3.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.7.2...0.7.3)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump ruff from 0.7.3 to 0.8.0 (#2994)

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.7.3 to 0.8.0.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.7.3...0.8.0)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps): bump orjson from 3.10.11 to 3.10.12 (#2991)

Bumps [orjson](https://github.com/ijl/orjson) from 3.10.11 to 3.10.12.
- [Release notes](https://github.com/ijl/orjson/releases)
- [Changelog](https://github.com/ijl/orjson/blob/master/CHANGELOG.md)
- [Commits](ijl/orjson@3.10.11...3.10.12)

---
updated-dependencies:
- dependency-name: orjson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* added Node as an exported name from the root package location. Updated linting commands section in the developer section to use ruff check. (#2981)

* build(deps-dev): bump wheel from 0.45.0 to 0.45.1 (#2992)

Bumps [wheel](https://github.com/pypa/wheel) from 0.45.0 to 0.45.1.
- [Release notes](https://github.com/pypa/wheel/releases)
- [Changelog](https://github.com/pypa/wheel/blob/main/docs/news.rst)
- [Commits](pypa/wheel@0.45.0...0.45.1)

---
updated-dependencies:
- dependency-name: wheel
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nicholas Car <nick@kurrawong.net>

* feat: sort longturtle blank nodes (#2997)

* feat: sort longturtle blank nodes in the object position by their cbd string

* fix: #2767

* build(deps-dev): bump pytest from 8.3.3 to 8.3.4 (#2999)

Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.3.3 to 8.3.4.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](pytest-dev/pytest@8.3.3...8.3.4)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump poetry from 1.8.4 to 1.8.5 (#3001)

Bumps [poetry](https://github.com/python-poetry/poetry) from 1.8.4 to 1.8.5.
- [Release notes](https://github.com/python-poetry/poetry/releases)
- [Changelog](https://github.com/python-poetry/poetry/blob/1.8.5/CHANGELOG.md)
- [Commits](python-poetry/poetry@1.8.4...1.8.5)

---
updated-dependencies:
- dependency-name: poetry
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump ruff from 0.8.0 to 0.8.2 (#3003)

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.8.0 to 0.8.2.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.8.0...0.8.2)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump ruff from 0.8.2 to 0.8.3 (#3010)

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.8.2 to 0.8.3.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.8.2...0.8.3)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps): bump berkeleydb from 18.1.11 to 18.1.12 (#3009)

Bumps [berkeleydb](https://www.jcea.es/programacion/pybsddb.htm) from 18.1.11 to 18.1.12.

---
updated-dependencies:
- dependency-name: berkeleydb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
# Conflicts:
#	poetry.lock

* build(deps): bump orjson from 3.10.12 to 3.10.13 (#3018)

Bumps [orjson](https://github.com/ijl/orjson) from 3.10.12 to 3.10.13.
- [Release notes](https://github.com/ijl/orjson/releases)
- [Changelog](https://github.com/ijl/orjson/blob/master/CHANGELOG.md)
- [Commits](ijl/orjson@3.10.12...3.10.13)

---
updated-dependencies:
- dependency-name: orjson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump ruff from 0.8.4 to 0.8.6 (#3025)

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.8.4 to 0.8.6.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.8.4...0.8.6)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat: deterministic longturtle serialisation using RDF canonicalization + n-triples sort (#3008)

* feat: use the RGDA1 canonicalization algorithm + lexical n-triples sort to produce deterministic longturtle serialisation

* chore: normalise usage of format

* chore: apply black

* fix: double up of semicolons when subject is a blank node

* fix: lint

* jsonld: Do not merge nodes with different invalid URIs (#3011)

When parsing JSON-LD with invalid URIs in the `@id`, the
`generalized_rdf: True` option allows parsing these nodes as blank nodes
instead of outright rejecting the document.

However, all nodes with invalid URIs were mapped to the same blank node,
resulting in incorrect data. For example, without this patch, the new test
fails with:

```
AssertionError: Expected:
@Prefix schema: <https://schema.org/> .

<https://example.org/root-object> schema:author [ schema:familyName "Doe" ;
            schema:givenName "Jane" ;
            schema:name "Jane Doe" ],
        [ schema:familyName "Doe" ;
            schema:givenName "John" ;
            schema:name "John Doe" ] .

Got:
@Prefix schema: <https://schema.org/> .

<https://example.org/root-object> schema:author <> .

<> schema:familyName "Doe" ;
    schema:givenName "Jane",
        "John" ;
    schema:name "Jane Doe",
        "John Doe" .
```

* Fixed incorrect ASK behaviour for dataset with one element (#2989)

* Pass base uri to serializer when writing to file. (#2977)

Co-authored-by: Nicholas Car <nick@kurrawong.net>

* Dataset documentation improvements (#3012)

* example printout improvements

* added BN graph creation

* updated tests var names & added one subtest

* typos & improved formatting

* updated Graph & Dataset docco

* typo fix

* fix code-in-comment syntax

* fix code-in-comment syntax 2

* fix code-in-comment syntax - ellipses

* fix code-in-comment syntax - sort print loop output

* blacked

* ruff fixes

* Poetry 2.0.0 pyproject.toml file

* move to PEP621 (Poetry 2.0.0) pyproject.toml

* require poetry 2.0.0

* require poetry 2.0.0

* add in requirement for poetry-plugin-export

* change from --sync to sync command

* further pyproject.toml format updates

* add poetry plugin to requirements-poetry.in

* fix pre-commit poetry version to 2.0.0

* remove testing artifact

* update license to 2025

* add me to contributors

* remove outdated --check arg

* typo

* test add back in precommit args

* test remove precommit args

* match ruff version to pre-commit autoupdate PR #3026; add back in --check

* re-remove --check

* add David to CONTRIBUTORS

* ruff in pyproject.toml to match pre-commit

* updates for David's comments

* fix Dataset docc ReST formatting

* remove ConjunctiveGraph example; add Dataset example; add JSON-LS serialization example

* Add RDFLib Path to SHACL path utility and corresponding tests (#2990)

* shacl path parser: Add additional test case

* shacl utilities: Add new SHACL path building utility with corresponding tests

---------

Co-authored-by: Nicholas Car <nick@kurrawong.net>
# Conflicts:
#	rdflib/extras/shacl.py

* fix: typing and import issues

* fix: line length as int

* fix: ruff version conflict

* fix: berkeleydb pin to 18.1.10 for python 3.8 compatibility

* 3a not 2a

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
Co-authored-by: Nicholas Car <nick@kurrawong.net>
Co-authored-by: Ashley Sommer <ashleysommer@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alex Nelson <alexander.nelson@nist.gov>
Co-authored-by: joecrowleygaia <142864129+joecrowleygaia@users.noreply.github.com>
Co-authored-by: Val Lorentz <vlorentz@softwareheritage.org>
Co-authored-by: jcbiddle <114963309+jcbiddle@users.noreply.github.com>
Co-authored-by: Sander Van Dooren <sandervd@users.noreply.github.com>
Co-authored-by: Nicholas Car <nick@kurrawong.ai>
Co-authored-by: Matt Goldberg <59745812+mgberg@users.noreply.github.com>
@nicholascar
7.1.3-pre-release
4b0f580
@nicholascar
small docco update (#3053)
006949a
@nicholascar
7.1.3-post-release; some updated release info for devs (#3054)
f4f3b73
@dependabot
build(deps): bump orjson from 3.10.13 to 3.10.15 (#3055)
7d3666e 
Bumps [orjson](https://github.com/ijl/orjson) from 3.10.13 to 3.10.15.
- [Release notes](https://github.com/ijl/orjson/releases)
- [Changelog](https://github.com/ijl/orjson/blob/master/CHANGELOG.md)
- [Commits](ijl/orjson@3.10.13...3.10.15)

---
updated-dependencies:
- dependency-name: orjson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps-dev): bump ruff from 0.8.6 to 0.9.2 (#3047)
62c528d 
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.8.6 to 0.9.2.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.8.6...0.9.2)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump html5rdf from 1.2.0 to 1.2.1 in /docker/latest (#3045)
47165fc 
Bumps [html5rdf](https://github.com/RDFLib/html5rdf) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/RDFLib/html5rdf/releases)
- [Changelog](https://github.com/RDFLib/html5rdf/blob/main/CHANGES.rst)
- [Commits](https://github.com/RDFLib/html5rdf/commits/v1.2.1)

---
updated-dependencies:
- dependency-name: html5rdf
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump html5rdf from 1.2 to 1.2.1 (#3048)
74afcb0 
Bumps [html5rdf](https://github.com/RDFLib/html5rdf) from 1.2 to 1.2.1.
- [Release notes](https://github.com/RDFLib/html5rdf/releases)
- [Changelog](https://github.com/RDFLib/html5rdf/blob/main/CHANGES.rst)
- [Commits](https://github.com/RDFLib/html5rdf/commits/v1.2.1)

---
updated-dependencies:
- dependency-name: html5rdf
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps-dev): bump wheel from 0.44.0 to 0.45.1 (#3051)
cfd4222 
Bumps [wheel](https://github.com/pypa/wheel) from 0.44.0 to 0.45.1.
- [Release notes](https://github.com/pypa/wheel/releases)
- [Changelog](https://github.com/pypa/wheel/blob/main/docs/news.rst)
- [Commits](pypa/wheel@0.44.0...0.45.1)

---
updated-dependencies:
- dependency-name: wheel
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @nicholascar
build(deps-dev): bump ruff 0.9.2 - 0.9.6 + readthedocs conf (#3072)
89103ec 
* build(deps-dev): bump ruff from 0.9.2 to 0.9.6

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.9.2 to 0.9.6.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.9.2...0.9.6)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* add readthedocs sphynx.configuration

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nicholas Car <nick@kurrawong.net>
Co-authored-by: Nicholas Car <nick@kurrawong.ai>
@dependabot @nicholascar
build(deps): bump lxml from 5.3.0 to 5.3.1 (#3071)
282ed56 
Bumps [lxml](https://github.com/lxml/lxml) from 5.3.0 to 5.3.1.
- [Release notes](https://github.com/lxml/lxml/releases)
- [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
- [Commits](lxml/lxml@lxml-5.3.0...lxml-5.3.1)

---
updated-dependencies:
- dependency-name: lxml
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nicholas Car <nick@kurrawong.net>
@nphilipp @nicholascar
Cope with Namespace annotations in Python 3.14 (#3084)
62685d8 
The __annotations__ member can be incomplete, use the get_annotations()
helper from annotationlib (Python >= 3.14) or inspect (Python >= 3.10)
if available.

Related: #3083

Signed-off-by: Nils Philippsen <nils@tiptoe.de>
Co-authored-by: Nicholas Car <nick@kurrawong.net>
@dependabot
build(deps): bump dorny/test-reporter from 1 to 2 (#3081)
9af9a40 
Bumps [dorny/test-reporter](https://github.com/dorny/test-reporter) from 1 to 2.
- [Release notes](https://github.com/dorny/test-reporter/releases)
- [Changelog](https://github.com/dorny/test-reporter/blob/main/CHANGELOG.md)
- [Commits](dorny/test-reporter@v1...v2)

---
updated-dependencies:
- dependency-name: dorny/test-reporter
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps-dev): bump pytest from 8.3.4 to 8.3.5 (#3079)
c1fc39e 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.3.4 to 8.3.5.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](pytest-dev/pytest@8.3.4...8.3.5)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @nicholascar
build(deps): bump library/python in /docker/unstable (#3067)
e4d28f1 
Bumps library/python from 3.12.7-slim to 3.13.2-slim.

---
updated-dependencies:
- dependency-name: library/python
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nicholas Car <nick@kurrawong.net>
@dependabot @nicholascar
build(deps): bump library/python in /docker/latest (#3066)
69b7d6c 
Bumps library/python from 3.12.7-slim to 3.13.2-slim.

---
updated-dependencies:
- dependency-name: library/python
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nicholas Car <nick@kurrawong.net>
@a-detiste @nicholascar
remove old hacks against 2to3 (#3076)
b74c657 
This reverts e2fb491

Co-authored-by: Nicholas Car <nick@kurrawong.net>
@yarikoptic @nicholascar
Downgrade log message about plugin without override argument to debug…
c560028 
… from warning (#3063)

Original issue

- #1880

was worked around by providing a fall back call without "override" in

- #2018

As a result any user with such a store (in our case just <class
'rdflib.plugins.memory.IOMemory'>) is flooded with such warnings pointing to
that issue #1880 and for all means and purposes AFAIK just need to ignore
them since there is nothing user can do to address it.

That raises the question on why is it a Warning at a user level and not some
debug message for developers/troubleshooting etc?  Hence I am lowering it to
debug level to bring peace of mind to users of the library.

Co-authored-by: Nicholas Car <nick@kurrawong.net>
@pre-commit-ci @nicholascar
[pre-commit.ci] pre-commit autoupdate (#3056)
7d1f4c7 
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.5.4 → v0.11.0](astral-sh/ruff-pre-commit@v0.5.4...v0.11.0)
- [github.com/psf/black-pre-commit-mirror: 24.4.2 → 25.1.0](psf/black-pre-commit-mirror@24.4.2...25.1.0)
- [github.com/python-poetry/poetry: 1.8.3 → 2.1.1](python-poetry/poetry@1.8.3...2.1.1)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Nicholas Car <nick@kurrawong.net>
@nicholascar @dependabot
Reduce warnings (#3085)
8bbb30d 
* build(deps-dev): bump ruff from 0.9.2 to 0.9.6

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.9.2 to 0.9.6.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.9.2...0.9.6)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* add readthedocs sphynx.configuration

* replace ConjunctiveGraph() with Dataset() in tests

* tidy some notation

* align black version

* fix black & ruff

* poetry --check -> poetry-check --lock

* more CG -> Datasets

* ruff

* GC -> Dataset

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@nicholascar @dependabot
Reduce warnings (#3087)
4cf2180 
* build(deps-dev): bump ruff from 0.9.2 to 0.9.6

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.9.2 to 0.9.6.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.9.2...0.9.6)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* add readthedocs sphynx.configuration

* replace ConjunctiveGraph() with Dataset() in tests

* tidy some notation

* align black version

* fix black & ruff

* poetry --check -> poetry-check --lock

* more CG -> Datasets

* ruff

* GC -> Dataset

* CG -> D

* ruff fixes

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@nicholascar
Allow multi subjects & objects in graph funcs (#3086)
0c277e9 
* subjects()

* objects() & tests

* blacked
@dependabot
build(deps): bump library/python in /docker/unstable (#3089)
d220ee3 
Bumps library/python from `ae9f9ac` to `8f3aba4`.

---
updated-dependencies:
- dependency-name: library/python
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@nicholascar
7.1.4 pre-release
c731354
@nicholascar
7.1.4 pre-release (#3098)
721164c
@nicholascar
Merge remote-tracking branch 'origin/main'
95eda41
@edmondchuc @ddeschepper
fix namespace prefixes in longturtle serialization (#3134)
0c16362 
Co-authored-by: Daan de Schepper <d.de.schepper@rijksmuseum.nl>
@edmondchuc
Fix failing webtest (#3194)
14071b0 
* test: fix failing webtest

Fixes #3192

* Revert "remove old hacks against 2to3 (#3076)" (#3195)

This reverts commit b74c657.
@slahn @nicholascar @edmondchuc
Specify Optional parameters in Graph.triples_choices (#3075)
4d9935c 
* Specify `Optional` parameters in `Graph.triples_choices`

The two non-list parameters can be `None`, but this is not reflected in
the type hint.

Also introduces a type alias to simplify method signatures.

* style: remove unused imports

---------

Co-authored-by: Nicholas Car <nick@kurrawong.net>
Co-authored-by: Edmond Chuc <37032744+edmondchuc@users.noreply.github.com>
Co-authored-by: Edmond Chuc <edmond@kurrawong.ai>
@edmondchuc
Merge branch 'main' into edmond/7-to-main
4281096
@edmondchuc
Revert "remove old hacks against 2to3 (#3076)"
3a3b858 
This reverts commit b74c657.
@edmondchuc
ci: try to fix failing ci
d77ef9f
@edmondchuc
Revert "ci: try to fix failing ci"
5c8a04e 
This reverts commit d77ef9f.
@edmondchuc
ci: specify setuptools as a deps in tox.ini to prevent downgrade, lea…
b0ace6a 
…ding to pip ModuleNotFoundError for pip._vendor
@edmondchuc
test: mark SPARQLStore class docstring as webtest
f5496de
@edmondchuc
ci: fix setuptools missing in plugin isolated env
4ad27a6
@edmondchuc
Revert "test: mark SPARQLStore class docstring as webtest"
364e23d 
This reverts commit f5496de.
@edmondchuc
test: skip SPARQLStore docstring test. It currently fails inside fire…
68bd450 
…jail due to the need to perform DNS name resolution.

Skipping for now until we can find a better way to mark it as webtest.
@edmondchuc
style: formatting
a603579
@edmondchuc
test: fix SPARQLStore docstring test
5c69b40
@edmondchuc
test: mark plugin tests as webtest
ea8463a
@edmondchuc
Copy link
Contributor Author

edmondchuc commented Sep 5, 2025

It was rough, but I've finally managed to get the CI tests to pass.

Errors when pip tries to downgrade setuptools in ubuntu-latest
This only happened in ubuntu-latest and from what I could tell, it was intermittent. The CI was running into missing vendorised pip modules when downgrading setuptools. Not sure why it was happening and why it's not occurring in the 7-maintenance branch, but this commit b0ace6a fixes the issue by ensuring the correct version of setuptools is installed before poetry sync is run.

Plugin tests failing due to setuptools missing
These tests were failing because setuptools is missing and pip tries to download it from PyPI with the --no-index flag. This is not an issue in 7-maintenance. I've fixed this in 4ad27a6 by downloading and making setuptools and wheels available to the pip install command.

Firejail related test errors
The above plugin test and also a docstring test started to fail because they require connectivity to the internet. I've since marked the pytest tests with webtest and skipped the docstring test completely. I couldn't figure out how to skip the docstring test with the webtest marker. These commits 5c69b40 ea8463a fix these issues.

@nicholascar nicholascar merged commit 0a054e3 into main Sep 9, 2025
22 checks passed
@nicholascar nicholascar deleted the edmond/7-to-main branch September 9, 2025 03:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nicholascar nicholascar nicholascar approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@edmondchuc @nicholascar @nphilipp @a-detiste @yarikoptic @slahn