From ca212904f7372a8d8e3f5501616597f7c0a4a545 Mon Sep 17 00:00:00 2001 From: "David I. Lehn" Date: Fri, 3 Nov 2023 18:10:49 -0400 Subject: [PATCH 01/17] Switch from travis-ci to GitHub workflow. --- .github/workflows/main.yaml | 54 +++++++++++++++++++++++++++++++++++++ .travis.yml | 42 ----------------------------- 2 files changed, 54 insertions(+), 42 deletions(-) create mode 100644 .github/workflows/main.yaml delete mode 100644 .travis.yml diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml new file mode 100644 index 0000000..48f65b7 --- /dev/null +++ b/.github/workflows/main.yaml @@ -0,0 +1,54 @@ +name: Main CI + +on: [push] + +jobs: + #lint: + # FIXME + test: + runs-on: ubuntu-latest + #needs: [lint] + timeout-minutes: 10 + strategy: + matrix: + python-version: + #- '3.4' + #- '3.5' + #- '3.6' + - '3.7' + - '3.8' + - '3.9' + - '3.10' + - '3.11' + - '3.12' + - 'pypy3.10' + loader: [requests, aiohttp] + #exclude: + # - python-version: "3.4" + # loader: aiohttp + steps: + - uses: actions/checkout@v4 + - name: Use Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: 'pip' + - name: Install + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + - name: Fetch test suites + run: | + git clone --depth 1 https://github.com/w3c/json-ld-api.git _json-ld-api + git clone --depth 1 https://github.com/w3c/json-ld-framing.git _json-ld-framing + git clone --depth 1 https://github.com/json-ld/normalization.git _normalization + - name: Test with Python=${{ matrix.python-version }} Loader=${{ matrix.loader }} + run: | + python tests/runtests.py ./_json-ld-api/tests -l ${{ matrix.loader }} + python tests/runtests.py ./_json-ld-framing/tests -l ${{ matrix.loader }} + python tests/runtests.py ./_normalization/tests -l ${{ matrix.loader }} + env: + LOADER: ${{ matrix.loader }} + #coverage: + # needs: [test] + # FIXME diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 9e92aa1..0000000 --- a/.travis.yml +++ /dev/null @@ -1,42 +0,0 @@ -dist: xenial -language: python -cache: pip -python: - - "3.4" - - "3.5" - - "3.6" - - "3.7" - - "3.8" - - "pypy3" -sudo: false - -# Define document loaders -env: - - LOADER=requests - - LOADER=aiohttp - -matrix: - exclude: - - python: "3.4" - env: LOADER=aiohttp - allow_failures: - - python: "3.4" - - python: "3.5" - -install: - - pip install -r requirements.txt - - git clone --depth 1 https://github.com/w3c/json-ld-api.git _json-ld-api - - git clone --depth 1 https://github.com/w3c/json-ld-framing.git _json-ld-framing - - git clone --depth 1 https://github.com/json-ld/normalization.git _normalization - -# Download test suite and run tests... submodule? meta testing project with -# all of the reference implementations? -script: - - python tests/runtests.py ./_json-ld-api/tests -l $LOADER - - python tests/runtests.py ./_json-ld-framing/tests -l $LOADER - - python tests/runtests.py ./_normalization/tests -l $LOADER - -notifications: - email: - on_success: change - on_failure: change From a8db2af562e2d71fd298ea5d631103048acfa8cb Mon Sep 17 00:00:00 2001 From: "David I. Lehn" Date: Fri, 3 Nov 2023 19:07:19 -0400 Subject: [PATCH 02/17] Add flake8 lint workflow. --- .github/workflows/main.yaml | 29 ++++++++++++++++++++++++++--- requirements-test.txt | 1 + 2 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 requirements-test.txt diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 48f65b7..ab16881 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -3,11 +3,34 @@ name: Main CI on: [push] jobs: - #lint: - # FIXME + lint: + runs-on: ubuntu-latest + timeout-minutes: 10 + strategy: + matrix: + python-version: + - '3.12' + steps: + - uses: actions/checkout@v4 + - name: Use Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: 'pip' + - name: Install testing dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements-test.txt + - name: Lint + # FIXME + continue-on-error: true + run: | + flake8 lib/pyld tests --count --show-source --statistics + env: + LOADER: ${{ matrix.loader }} test: runs-on: ubuntu-latest - #needs: [lint] + needs: [lint] timeout-minutes: 10 strategy: matrix: diff --git a/requirements-test.txt b/requirements-test.txt new file mode 100644 index 0000000..3930480 --- /dev/null +++ b/requirements-test.txt @@ -0,0 +1 @@ +flake8 From b9d25d68385082634cec701487e52fbb3fe63156 Mon Sep 17 00:00:00 2001 From: "David I. Lehn" Date: Fri, 3 Nov 2023 19:07:41 -0400 Subject: [PATCH 03/17] Support Python >= 3.8. --- .github/workflows/main.yaml | 12 ++++-------- CHANGELOG.md | 5 +++++ README.rst | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index ab16881..f0c09bf 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -35,10 +35,6 @@ jobs: strategy: matrix: python-version: - #- '3.4' - #- '3.5' - #- '3.6' - - '3.7' - '3.8' - '3.9' - '3.10' @@ -46,9 +42,6 @@ jobs: - '3.12' - 'pypy3.10' loader: [requests, aiohttp] - #exclude: - # - python-version: "3.4" - # loader: aiohttp steps: - uses: actions/checkout@v4 - name: Use Python ${{ matrix.python-version }} @@ -56,10 +49,13 @@ jobs: with: python-version: ${{ matrix.python-version }} cache: 'pip' - - name: Install + - name: Install dependencies run: | python -m pip install --upgrade pip pip install -r requirements.txt + - name: Install testing dependencies + run: | + pip install -r requirements-test.txt - name: Fetch test suites run: | git clone --depth 1 https://github.com/w3c/json-ld-api.git _json-ld-api diff --git a/CHANGELOG.md b/CHANGELOG.md index 02113ea..251dc9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # pyld ChangeLog +## 3.0.0 - 2023-xx-xx + +### Changed +- **BREAKING**: Require supported Python version >= 3.8. + ## 2.0.3 - 2020-08-06 ### Fixed diff --git a/README.rst b/README.rst index f1b1a50..978d977 100644 --- a/README.rst +++ b/README.rst @@ -59,7 +59,7 @@ yet supported. Requirements ------------ -- Python_ (3.6 or later) +- Python_ (3.8 or later) - Requests_ (optional) - aiohttp_ (optional, Python 3.5 or later) From 9ee13f0ad325f6291cd0c2f54a4f74d9ffc76bbe Mon Sep 17 00:00:00 2001 From: Sebastian Schmittner Date: Tue, 13 Apr 2021 09:47:56 +0200 Subject: [PATCH 04/17] fixing dead link in comment --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 978d977..e1fba8c 100644 --- a/README.rst +++ b/README.rst @@ -139,7 +139,7 @@ Quick Examples # document transformed into a particular tree structure per the given frame # normalize a document using the RDF Dataset Normalization Algorithm - # (URDNA2015), see: https://json-ld.github.io/normalization/spec/ + # (URDNA2015), see: https://json-ld.github.io/rdf-dataset-canonicalization/spec/index.html normalized = jsonld.normalize( doc, {'algorithm': 'URDNA2015', 'format': 'application/n-quads'}) # normalized is a string that is a canonical representation of the document From b7086a5ded732deca9259f7d559792d0a195ab35 Mon Sep 17 00:00:00 2001 From: Sebastian Schmittner Date: Thu, 19 Oct 2023 09:11:43 +0200 Subject: [PATCH 05/17] fixing another dead link Co-authored-by: Anatoly Scherbakov --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index e1fba8c..3c761f5 100644 --- a/README.rst +++ b/README.rst @@ -139,7 +139,7 @@ Quick Examples # document transformed into a particular tree structure per the given frame # normalize a document using the RDF Dataset Normalization Algorithm - # (URDNA2015), see: https://json-ld.github.io/rdf-dataset-canonicalization/spec/index.html + # (URDNA2015), see: https://www.w3.org/TR/rdf-canon/ normalized = jsonld.normalize( doc, {'algorithm': 'URDNA2015', 'format': 'application/n-quads'}) # normalized is a string that is a canonical representation of the document From 342e7a2a6570c8f50af7c0fdcf4f1a8a566ae0ed Mon Sep 17 00:00:00 2001 From: Anatoly Scherbakov Date: Wed, 18 Oct 2023 19:34:56 +0400 Subject: [PATCH 06/17] Add submodules --- .gitmodules | 11 +++++++++++ specifications/json-ld-api | 1 + specifications/json-ld-framing | 1 + specifications/rdf-canon | 1 + 4 files changed, 14 insertions(+) create mode 100644 .gitmodules create mode 160000 specifications/json-ld-api create mode 160000 specifications/json-ld-framing create mode 160000 specifications/rdf-canon diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..ea90020 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,11 @@ +[submodule "specifications/json-ld-api"] + path = specifications/json-ld-api + url = git@github.com:w3c/json-ld-api.git + +[submodule "specifications/json-ld-framing"] + path = specifications/json-ld-framing + url = git@github.com:w3c/json-ld-framing.git + +[submodule "specifications/rdf-canon"] + path = specifications/rdf-canon + url = git@github.com:w3c/rdf-canon.git diff --git a/specifications/json-ld-api b/specifications/json-ld-api new file mode 160000 index 0000000..6bf9ef4 --- /dev/null +++ b/specifications/json-ld-api @@ -0,0 +1 @@ +Subproject commit 6bf9ef4e2135c0146a8120b9732f67809503bb9c diff --git a/specifications/json-ld-framing b/specifications/json-ld-framing new file mode 160000 index 0000000..c01b175 --- /dev/null +++ b/specifications/json-ld-framing @@ -0,0 +1 @@ +Subproject commit c01b17540361040f2ee1f990aff138b5e81bbf5d diff --git a/specifications/rdf-canon b/specifications/rdf-canon new file mode 160000 index 0000000..0503fac --- /dev/null +++ b/specifications/rdf-canon @@ -0,0 +1 @@ +Subproject commit 0503facfaa0825686afc1f533f487816de54d9b7 From 5732dafab730f6ddda4d53790594dbcb605d4b23 Mon Sep 17 00:00:00 2001 From: Anatoly Scherbakov Date: Wed, 18 Oct 2023 19:35:07 +0400 Subject: [PATCH 07/17] Update `.gitignore` --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 022ac42..665eab2 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,9 @@ lib/PyLD.egg-info profiler tests/test_caching.py tests/data/test_caching.json + +# Local Python version with `pyenv` +.python-version + +# PyCharm & other JetBrains IDEs +.idea From 1fc8668a76aea7ddf85849539b3b5f901541803d Mon Sep 17 00:00:00 2001 From: Anatoly Scherbakov Date: Sun, 12 Nov 2023 18:21:37 +0200 Subject: [PATCH 08/17] Use spec tests from git modules as default test targets --- tests/runtests.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/tests/runtests.py b/tests/runtests.py index 08ed0d3..e618513 100644 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -17,6 +17,8 @@ import unittest import re from argparse import ArgumentParser +from pathlib import Path +from typing import List from unittest import TextTestResult sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', 'lib')) @@ -32,9 +34,20 @@ LOCAL_BASES = [ 'https://w3c.github.io/json-ld-api/tests', 'https://w3c.github.io/json-ld-framing/tests', - 'https://github.com/json-ld/normalization/tests' + 'https://w3c.github.io/rdf-canon/tests/', ] + +def default_test_targets() -> List[Path]: + """Default test directories from specifications.""" + specifications = Path(__file__).parent.parent / 'specifications' + return [ + specifications / 'json-ld-api/tests', + specifications / 'json-ld-framing/tests', + specifications / 'rdf-canon/tests', + ] + + class TestRunner(unittest.TextTestRunner): """ Loads test manifests and runs tests. @@ -95,18 +108,7 @@ def main(self): test_targets = self.options.tests else: # default to find known sibling test dirs - test_targets = [] - sibling_dirs = [ - '../json-ld-api/tests/', - '../json-ld-framing/tests/', - '../normalization/tests/', - ] - for dir in sibling_dirs: - if os.path.exists(dir): - print('Test dir found', dir) - test_targets.append(dir) - else: - print('Test dir not found', dir) + test_targets = default_test_targets() # ensure a manifest or a directory was specified if len(test_targets) == 0: From d984f260d268b887991cab1f43a10b994805899d Mon Sep 17 00:00:00 2001 From: Anatoly Scherbakov Date: Sun, 12 Nov 2023 18:34:35 +0200 Subject: [PATCH 09/17] Note about Git submodules in `README.rst` --- README.rst | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index 3c761f5..77232e7 100644 --- a/README.rst +++ b/README.rst @@ -190,16 +190,24 @@ Tests This library includes a sample testing utility which may be used to verify that changes to the processor maintain the correct output. -To run the sample tests you will need to get the test suite files by cloning -the ``json-ld-api``, ``json-ld-framing``, and ``normalization`` repositories -hosted on GitHub: +To run the sample tests you will need the test suite files provided in the +``json-ld-api``, ``json-ld-framing``, and ``rdf-canon`` repositories hosted +on GitHub: - https://github.com/w3c/json-ld-api - https://github.com/w3c/json-ld-framing -- https://github.com/json-ld/normalization +- https://github.com/w3c/rdf-canon -If the suites repositories are available as sibling directories of the PyLD -source directory, then all the tests can be run with the following: +They are included beneath ``specifications`` directory of this repository as +Git submodules. By default, ``git clone`` does +not retrieve submodules; to download them, please issue the following command: + +.. code-block:: bash + + git submodule update --init --recursive + +If the suites repositories are available then all the tests can be run with +the following: .. code-block:: bash From 592168cbf7f57619fa168b4e8702267337f61ba8 Mon Sep 17 00:00:00 2001 From: Anatoly Scherbakov Date: Thu, 7 Dec 2023 00:00:43 +0400 Subject: [PATCH 10/17] Add `make upgrade-submodules` command --- Makefile | 2 ++ README.rst | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..9183a74 --- /dev/null +++ b/Makefile @@ -0,0 +1,2 @@ +upgrade-submodules: + git submodule update --remote --init --recursive diff --git a/README.rst b/README.rst index 77232e7..62bb91a 100644 --- a/README.rst +++ b/README.rst @@ -204,7 +204,9 @@ not retrieve submodules; to download them, please issue the following command: .. code-block:: bash - git submodule update --init --recursive + make upgrade-submodules + +Issue the same command to update each submodule to the latest available commit. If the suites repositories are available then all the tests can be run with the following: From e3de0748a4db81a3a412e483eb200ab2c59e1754 Mon Sep 17 00:00:00 2001 From: Anatoly Scherbakov Date: Thu, 7 Dec 2023 00:00:57 +0400 Subject: [PATCH 11/17] Upgrade submodules --- specifications/json-ld-api | 2 +- specifications/json-ld-framing | 2 +- specifications/rdf-canon | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specifications/json-ld-api b/specifications/json-ld-api index 6bf9ef4..f18efc9 160000 --- a/specifications/json-ld-api +++ b/specifications/json-ld-api @@ -1 +1 @@ -Subproject commit 6bf9ef4e2135c0146a8120b9732f67809503bb9c +Subproject commit f18efc9ca3c9c519b4db38ce31d8527b1fe776c2 diff --git a/specifications/json-ld-framing b/specifications/json-ld-framing index c01b175..5bd3bba 160000 --- a/specifications/json-ld-framing +++ b/specifications/json-ld-framing @@ -1 +1 @@ -Subproject commit c01b17540361040f2ee1f990aff138b5e81bbf5d +Subproject commit 5bd3bba22179923a206153673038ff6f426d8e7c diff --git a/specifications/rdf-canon b/specifications/rdf-canon index 0503fac..eaf67e3 160000 --- a/specifications/rdf-canon +++ b/specifications/rdf-canon @@ -1 +1 @@ -Subproject commit 0503facfaa0825686afc1f533f487816de54d9b7 +Subproject commit eaf67e398b2358f9987c9550443c109d43ce89b1 From c195dcd0098e186f90cb0e6d40b92698bd20e581 Mon Sep 17 00:00:00 2001 From: Anatoly Scherbakov Date: Tue, 6 Feb 2024 16:23:34 +0400 Subject: [PATCH 12/17] Remove trailing / at tests/runtests.py Co-authored-by: David I. Lehn --- tests/runtests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/runtests.py b/tests/runtests.py index e618513..3064759 100644 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -34,7 +34,7 @@ LOCAL_BASES = [ 'https://w3c.github.io/json-ld-api/tests', 'https://w3c.github.io/json-ld-framing/tests', - 'https://w3c.github.io/rdf-canon/tests/', + 'https://w3c.github.io/rdf-canon/tests', ] From 4a813dd7b971a1663271191b1258c465974ebbcd Mon Sep 17 00:00:00 2001 From: Anatoly Scherbakov Date: Wed, 7 Feb 2024 01:19:49 +0400 Subject: [PATCH 13/17] Add `rdf-dataset-canonicalization` specification --- .gitmodules | 4 ++++ specifications/rdf-dataset-canonicalization | 1 + 2 files changed, 5 insertions(+) create mode 160000 specifications/rdf-dataset-canonicalization diff --git a/.gitmodules b/.gitmodules index ea90020..3ca84f3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,3 +9,7 @@ [submodule "specifications/rdf-canon"] path = specifications/rdf-canon url = git@github.com:w3c/rdf-canon.git + +[submodule "specifications/rdf-dataset-canonicalization"] + path = specifications/rdf-dataset-canonicalization + url = git@github.com:w3c-ccg/rdf-dataset-canonicalization.git diff --git a/specifications/rdf-dataset-canonicalization b/specifications/rdf-dataset-canonicalization new file mode 160000 index 0000000..fbcfce5 --- /dev/null +++ b/specifications/rdf-dataset-canonicalization @@ -0,0 +1 @@ +Subproject commit fbcfce5730bf2726c131a84d06ffb686a190a969 From 05df321dc10fe82bd347c5466c1a0674c797290f Mon Sep 17 00:00:00 2001 From: Anatoly Scherbakov Date: Wed, 7 Feb 2024 01:41:28 +0400 Subject: [PATCH 14/17] Upgrade specifications --- specifications/json-ld-api | 2 +- specifications/json-ld-framing | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specifications/json-ld-api b/specifications/json-ld-api index f18efc9..229c823 160000 --- a/specifications/json-ld-api +++ b/specifications/json-ld-api @@ -1 +1 @@ -Subproject commit f18efc9ca3c9c519b4db38ce31d8527b1fe776c2 +Subproject commit 229c8236ce88083dc08985609dcab03ca3ae4731 diff --git a/specifications/json-ld-framing b/specifications/json-ld-framing index 5bd3bba..f139202 160000 --- a/specifications/json-ld-framing +++ b/specifications/json-ld-framing @@ -1 +1 @@ -Subproject commit 5bd3bba22179923a206153673038ff6f426d8e7c +Subproject commit f1392029b39019ae8f69ec81347d4f8b9607f858 From 60654aeef41964505085bc3a65f3756f22999e3a Mon Sep 17 00:00:00 2001 From: Anatoly Scherbakov Date: Wed, 7 Feb 2024 01:41:51 +0400 Subject: [PATCH 15/17] Use previous version of RDF canonicalization spec --- README.rst | 3 ++- tests/runtests.py | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 62bb91a..1e1bcd9 100644 --- a/README.rst +++ b/README.rst @@ -139,7 +139,7 @@ Quick Examples # document transformed into a particular tree structure per the given frame # normalize a document using the RDF Dataset Normalization Algorithm - # (URDNA2015), see: https://www.w3.org/TR/rdf-canon/ + # (URDNA2015), see: https://json-ld.github.io/normalization/spec/ normalized = jsonld.normalize( doc, {'algorithm': 'URDNA2015', 'format': 'application/n-quads'}) # normalized is a string that is a canonical representation of the document @@ -196,6 +196,7 @@ on GitHub: - https://github.com/w3c/json-ld-api - https://github.com/w3c/json-ld-framing +- https://github.com/w3c-ccg/rdf-dataset-canonicalization - https://github.com/w3c/rdf-canon They are included beneath ``specifications`` directory of this repository as diff --git a/tests/runtests.py b/tests/runtests.py index 3064759..50bfaa9 100644 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -34,6 +34,7 @@ LOCAL_BASES = [ 'https://w3c.github.io/json-ld-api/tests', 'https://w3c.github.io/json-ld-framing/tests', + 'https://github.com/w3c-ccg/rdf-dataset-canonicalization/tree/main/tests', 'https://w3c.github.io/rdf-canon/tests', ] @@ -44,7 +45,10 @@ def default_test_targets() -> List[Path]: return [ specifications / 'json-ld-api/tests', specifications / 'json-ld-framing/tests', - specifications / 'rdf-canon/tests', + specifications / 'rdf-dataset-canonicalization/tests', + + # TODO: Replace the above to use the newer RDF Canonicalization spec. + # specifications / 'rdf-canon/tests', ] From d2f79206c388d4d8da494fb6f12a5f717060d747 Mon Sep 17 00:00:00 2001 From: Anatoly Scherbakov Date: Wed, 7 Feb 2024 01:42:08 +0400 Subject: [PATCH 16/17] Add `make test` command --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 9183a74..effc164 100644 --- a/Makefile +++ b/Makefile @@ -1,2 +1,5 @@ upgrade-submodules: git submodule update --remote --init --recursive + +test: + python tests/runtests.py From 0435f6a33b78239b7c7575d82dc781d4361c5183 Mon Sep 17 00:00:00 2001 From: Anatoly Scherbakov Date: Thu, 8 Feb 2024 23:27:41 +0400 Subject: [PATCH 17/17] Delete `rdf-canon` for now --- .gitmodules | 4 ---- README.rst | 4 ++-- specifications/rdf-canon | 1 - tests/runtests.py | 4 ---- 4 files changed, 2 insertions(+), 11 deletions(-) delete mode 160000 specifications/rdf-canon diff --git a/.gitmodules b/.gitmodules index 3ca84f3..92fcb2e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,10 +6,6 @@ path = specifications/json-ld-framing url = git@github.com:w3c/json-ld-framing.git -[submodule "specifications/rdf-canon"] - path = specifications/rdf-canon - url = git@github.com:w3c/rdf-canon.git - [submodule "specifications/rdf-dataset-canonicalization"] path = specifications/rdf-dataset-canonicalization url = git@github.com:w3c-ccg/rdf-dataset-canonicalization.git diff --git a/README.rst b/README.rst index 1e1bcd9..2cc2485 100644 --- a/README.rst +++ b/README.rst @@ -191,13 +191,13 @@ This library includes a sample testing utility which may be used to verify that changes to the processor maintain the correct output. To run the sample tests you will need the test suite files provided in the -``json-ld-api``, ``json-ld-framing``, and ``rdf-canon`` repositories hosted +``json-ld-api``, ``json-ld-framing``, and ``rdf-dataset-canonicalization`` +repositories hosted on GitHub: - https://github.com/w3c/json-ld-api - https://github.com/w3c/json-ld-framing - https://github.com/w3c-ccg/rdf-dataset-canonicalization -- https://github.com/w3c/rdf-canon They are included beneath ``specifications`` directory of this repository as Git submodules. By default, ``git clone`` does diff --git a/specifications/rdf-canon b/specifications/rdf-canon deleted file mode 160000 index eaf67e3..0000000 --- a/specifications/rdf-canon +++ /dev/null @@ -1 +0,0 @@ -Subproject commit eaf67e398b2358f9987c9550443c109d43ce89b1 diff --git a/tests/runtests.py b/tests/runtests.py index 50bfaa9..d98c3d6 100644 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -35,7 +35,6 @@ 'https://w3c.github.io/json-ld-api/tests', 'https://w3c.github.io/json-ld-framing/tests', 'https://github.com/w3c-ccg/rdf-dataset-canonicalization/tree/main/tests', - 'https://w3c.github.io/rdf-canon/tests', ] @@ -46,9 +45,6 @@ def default_test_targets() -> List[Path]: specifications / 'json-ld-api/tests', specifications / 'json-ld-framing/tests', specifications / 'rdf-dataset-canonicalization/tests', - - # TODO: Replace the above to use the newer RDF Canonicalization spec. - # specifications / 'rdf-canon/tests', ]