Merge branch 'RDFLib:master' into master

Author: ms1901

test/conftest.py

@@ -1,5 +1,7 @@
 import pytest
 
+pytest.register_assert_rewrite("test.utils")
+
 from rdflib import Graph
 
 from .data import TEST_DATA_DIR
@@ -9,7 +11,6 @@
 
 # This is here so that asserts from these modules are formatted for human
 # readibility.
-pytest.register_assert_rewrite("test.utils")
 
 
 @pytest.fixture(scope="session")

test/data/fetcher.py

@@ -203,10 +203,17 @@ def _member_io(
     # NOTE: Commented out as this contains local modifications.
     # ArchiveResource(
     #     remote="https://www.w3.org/2009/sparql/docs/tests/sparql11-test-suite-20121023.tar.gz",
-    #     local_path=(DATA_PATH / "suites" / "DAWG" / "data-sparql11"),
+    #     local_path=(DATA_PATH / "suites" / "w3c" / "sparql11"),
     #     type=ArchiveType.TAR_GZ,
     #     pattern=re.compile(r"^[^\/]+[\/](.+)$"),
     # ),
+    # NOTE: Commented out as this contains local modifications.
+    # ArchiveResource(
+    #     remote="https://www.w3.org/2001/sw/DataAccess/tests/data-r2.tar.gz",
+    #     local_path=(DATA_PATH / "suites" / "w3c" / "dawg-data-r2"),
+    #     type=ArchiveType.TAR_GZ,
+    #     pattern=re.compile(r"^[^\/]+[\/]data-r2[\/](.+)$"),
+    # ),
     FileResource(
         remote=Request(
             "http://www.w3.org/2000/01/rdf-schema#", headers={"Accept": "text/turtle"}