[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
RDFLib · Jul 2, 2024 · 78106bb · 78106bb
1 parent ef1a229
commit 78106bb
Show file tree

Hide file tree

Showing 101 changed files with 238 additions and 245 deletions.
diff --git a/test/conftest.py b/test/conftest.py
@@ -10,9 +10,6 @@
 pytest.register_assert_rewrite("test.utils")
 
 from pathlib import Path
-from test.utils.audit import AuditHookDispatcher
-from test.utils.http import ctx_http_server
-from test.utils.httpfileserver import HTTPFileServer
 from typing import (
     Collection,
     Dict,
@@ -24,6 +21,9 @@
 )
 
 from rdflib import Graph
+from test.utils.audit import AuditHookDispatcher
+from test.utils.http import ctx_http_server
+from test.utils.httpfileserver import HTTPFileServer
 
 from .data import TEST_DATA_DIR
 from .utils.earl import EARLReporter

diff --git a/test/data.py b/test/data.py
@@ -1,7 +1,7 @@
 from pathlib import Path
-from test.utils.graph import cached_graph
 
 from rdflib import URIRef
+from test.utils.graph import cached_graph
 
 TEST_DIR = Path(__file__).parent
 TEST_DATA_DIR = TEST_DIR / "data"

diff --git a/test/data/suites/trix/test_trix.py b/test/data/suites/trix/test_trix.py
@@ -3,9 +3,6 @@
 
 from __future__ import annotations
 
-from test.data import TEST_DATA_DIR
-from test.utils.manifest import RDFTest, read_manifest
-from test.utils.namespace import RDFT
 from typing import Callable, Dict
 
 import pytest
@@ -14,6 +11,9 @@
 from rdflib.compare import graph_diff, isomorphic
 from rdflib.namespace import split_uri
 from rdflib.term import Node, URIRef
+from test.data import TEST_DATA_DIR
+from test.utils.manifest import RDFTest, read_manifest
+from test.utils.namespace import RDFT
 
 verbose = False
 

diff --git a/test/data/variants/diverse_quads.py b/test/data/variants/diverse_quads.py
@@ -1,8 +1,7 @@
-from test.utils.namespace import EGDC, EGSCHEME, EGURN
-
 from rdflib.graph import ConjunctiveGraph, Graph
 from rdflib.namespace import XSD
 from rdflib.term import Literal
+from test.utils.namespace import EGDC, EGSCHEME, EGURN
 
 
 def populate_graph(graph: Graph) -> None:

diff --git a/test/data/variants/diverse_triples.py b/test/data/variants/diverse_triples.py
@@ -1,7 +1,6 @@
-from test.utils.namespace import EGDC, EGSCHEME, EGURN
-
 from rdflib.graph import Graph
 from rdflib.term import Literal
+from test.utils.namespace import EGDC, EGSCHEME, EGURN
 
 
 def populate_graph(graph: Graph) -> None:

diff --git a/test/data/variants/simple_quad.py b/test/data/variants/simple_quad.py
@@ -1,6 +1,5 @@
-from test.utils.namespace import EGDO
-
 from rdflib.graph import ConjunctiveGraph, Graph
+from test.utils.namespace import EGDO
 
 
 def populate_graph(graph: Graph) -> None:

diff --git a/test/data/variants/simple_triple.py b/test/data/variants/simple_triple.py
@@ -1,6 +1,5 @@
-from test.utils.namespace import EGDO
-
 from rdflib.graph import Graph
+from test.utils.namespace import EGDO
 
 
 def populate_graph(graph: Graph) -> None:

diff --git a/test/jsonld/test_nested_arrays.py b/test/jsonld/test_nested_arrays.py
@@ -1,9 +1,8 @@
 from __future__ import annotations
 
-from test.utils.namespace import EGDC
-
 from rdflib import Graph, Literal
 from rdflib.collection import Collection
+from test.utils.namespace import EGDC
 
 prop = EGDC["props/a"]
 res = EGDC["res"]

diff --git a/test/test_conjunctivegraph/test_conjunctivegraph_generators.py b/test/test_conjunctivegraph/test_conjunctivegraph_generators.py
@@ -1,7 +1,7 @@
 import os
-from test.data import TEST_DATA_DIR
 
 from rdflib import ConjunctiveGraph, URIRef
+from test.data import TEST_DATA_DIR
 
 timblcardn3 = open(os.path.join(TEST_DATA_DIR, "timbl-card.n3")).read()
 

diff --git a/test/test_conjunctivegraph/test_conjunctivegraph_operator_combinations.py b/test/test_conjunctivegraph/test_conjunctivegraph_operator_combinations.py
@@ -1,7 +1,7 @@
 import os
-from test.data import CHEESE, LIKES, MICHEL, PIZZA, TAREK, TEST_DATA_DIR
 
 from rdflib import ConjunctiveGraph, Graph
+from test.data import CHEESE, LIKES, MICHEL, PIZZA, TAREK, TEST_DATA_DIR
 
 sportquadstrig = open(os.path.join(TEST_DATA_DIR, "sportquads.trig")).read()
 

diff --git a/test/test_dataset/test_dataset.py b/test/test_dataset/test_dataset.py
@@ -2,14 +2,14 @@
 import shutil
 import tempfile
 import warnings
-from test.data import CONTEXT1, LIKES, PIZZA, TAREK
-from test.utils.namespace import EGSCHEME
 
 import pytest
 
 from rdflib import URIRef, plugin
 from rdflib.graph import DATASET_DEFAULT_GRAPH_ID, Dataset, Graph
 from rdflib.store import Store
+from test.data import CONTEXT1, LIKES, PIZZA, TAREK
+from test.utils.namespace import EGSCHEME
 
 # Will also run SPARQLUpdateStore tests against local SPARQL1.1 endpoint if
 # available. This assumes SPARQL1.1 query/update endpoints running locally at

diff --git a/test/test_dataset/test_dataset_default_graph.py b/test/test_dataset/test_dataset_default_graph.py
@@ -2,14 +2,14 @@
 
 import itertools
 import logging
-from test.data import TEST_DATA_DIR
 from typing import Iterable, Type, Union
 
 import pytest
 from _pytest.mark.structures import ParameterSet
 
 from rdflib.graph import DATASET_DEFAULT_GRAPH_ID, ConjunctiveGraph, Dataset
 from rdflib.term import BNode, URIRef
+from test.data import TEST_DATA_DIR
 
 
 def make_load_default_and_named() -> Iterable[ParameterSet]:

diff --git a/test/test_dataset/test_dataset_generators.py b/test/test_dataset/test_dataset_generators.py
@@ -1,7 +1,7 @@
 import os
-from test.data import BOB, CHEESE, HATES, LIKES, MICHEL, PIZZA, TAREK, TEST_DATA_DIR
 
 from rdflib import Dataset, URIRef
+from test.data import BOB, CHEESE, HATES, LIKES, MICHEL, PIZZA, TAREK, TEST_DATA_DIR
 
 timblcardn3 = open(os.path.join(TEST_DATA_DIR, "timbl-card.n3")).read()
 

diff --git a/test/test_extras/test_infixowl/test_basic.py b/test/test_extras/test_infixowl/test_basic.py
@@ -1,5 +1,3 @@
-from test.data import CONTEXT0
-
 import pytest
 
 from rdflib import OWL, Graph, Literal, Namespace
@@ -12,6 +10,7 @@
     max,
     some,
 )
+from test.data import CONTEXT0
 
 EXNS = Namespace("http://example.org/vocab/")
 

diff --git a/test/test_extras/test_infixowl/test_class.py b/test/test_extras/test_infixowl/test_class.py
@@ -1,5 +1,3 @@
-from test.data import CONTEXT0, CONTEXT1
-
 import pytest
 
 from rdflib import OWL, RDFS, BNode, Graph, Literal, Namespace, URIRef, Variable
@@ -12,6 +10,7 @@
     max,
 )
 from rdflib.util import first
+from test.data import CONTEXT0, CONTEXT1
 
 EXNS = Namespace("http://example.org/vocab/")
 PZNS = Namespace(

diff --git a/test/test_extras/test_infixowl/test_cover.py b/test/test_extras/test_infixowl/test_cover.py
@@ -1,5 +1,3 @@
-from test.data import CONTEXT0, TEST_DATA_DIR
-
 import pytest
 
 from rdflib import OWL, RDF, RDFS, XSD, Graph, Literal, Namespace, URIRef, logger
@@ -28,6 +26,7 @@
     some,
     value,
 )
+from test.data import CONTEXT0, TEST_DATA_DIR
 
 EXNS = Namespace("http://example.org/vocab/")
 PZNS = Namespace(

diff --git a/test/test_extras/test_infixowl/test_individual.py b/test/test_extras/test_infixowl/test_individual.py
@@ -1,9 +1,8 @@
-from test.data import CONTEXT0, PIZZA
-
 import pytest
 
 from rdflib import OWL, RDFS, BNode, Graph, Literal, Namespace, URIRef
 from rdflib.extras.infixowl import Class, Individual
+from test.data import CONTEXT0, PIZZA
 
 EXNS = Namespace("http://example.org/vocab/")
 

diff --git a/test/test_extras/test_infixowl/test_manchester_syntax.py b/test/test_extras/test_infixowl/test_manchester_syntax.py
@@ -1,9 +1,8 @@
-from test.data import TEST_DATA_DIR
-
 import pytest
 
 from rdflib import OWL, RDFS, Graph, Literal, Namespace
 from rdflib.extras.infixowl import Class, Individual, manchesterSyntax
+from test.data import TEST_DATA_DIR
 
 EXNS = Namespace("http://example.org/vocab/")
 PZNS = Namespace(

diff --git a/test/test_graph/test_canonicalization.py b/test/test_graph/test_canonicalization.py
@@ -1,6 +1,5 @@
 from collections import Counter
 from io import StringIO
-from test.utils import GraphHelper
 from typing import TYPE_CHECKING, Set
 
 import pytest
@@ -10,6 +9,7 @@
 from rdflib.compare import to_canonical_graph, to_isomorphic
 from rdflib.namespace import FOAF
 from rdflib.plugins.stores.memory import Memory
+from test.utils import GraphHelper
 
 if TYPE_CHECKING:
     from rdflib.graph import _TripleType

diff --git a/test/test_graph/test_diff.py b/test/test_graph/test_diff.py
@@ -1,15 +1,6 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from test.utils import (
-    COLLAPSED_BNODE,
-    BNodeHandling,
-    GHQuad,
-    GHTriple,
-    GraphHelper,
-    MarksType,
-    MarkType,
-)
 from typing import TYPE_CHECKING, Collection, Set, Tuple, Type, Union, cast
 
 import pytest
@@ -21,6 +12,15 @@
 from rdflib.graph import ConjunctiveGraph, Dataset
 from rdflib.namespace import FOAF, RDF
 from rdflib.term import BNode, Literal
+from test.utils import (
+    COLLAPSED_BNODE,
+    BNodeHandling,
+    GHQuad,
+    GHTriple,
+    GraphHelper,
+    MarksType,
+    MarkType,
+)
 
 if TYPE_CHECKING:
     from rdflib.graph import _TripleType

diff --git a/test/test_graph/test_graph.py b/test/test_graph/test_graph.py
@@ -3,10 +3,6 @@
 import logging
 import os
 from pathlib import Path
-from test.data import BOB, CHEESE, HATES, LIKES, MICHEL, PIZZA, TAREK, TEST_DATA_DIR
-from test.utils import GraphHelper, get_unique_plugin_names
-from test.utils.httpfileserver import HTTPFileServer, ProtoFileResource
-from test.utils.outcome import ExceptionChecker, OutcomeChecker, OutcomePrimitive
 from typing import Callable, Optional, Set, Tuple
 from urllib.error import HTTPError, URLError
 
@@ -18,6 +14,10 @@
 from rdflib.plugin import PluginException
 from rdflib.store import Store
 from rdflib.term import BNode
+from test.data import BOB, CHEESE, HATES, LIKES, MICHEL, PIZZA, TAREK, TEST_DATA_DIR
+from test.utils import GraphHelper, get_unique_plugin_names
+from test.utils.httpfileserver import HTTPFileServer, ProtoFileResource
+from test.utils.outcome import ExceptionChecker, OutcomeChecker, OutcomePrimitive
 
 
 def test_property_store() -> None:

diff --git a/test/test_graph/test_graph_cbd.py b/test/test_graph/test_graph_cbd.py
@@ -1,13 +1,12 @@
 """Tests the Graph class' cbd() function"""
 
-from test.data import TEST_DATA_DIR
-from test.utils import BNodeHandling, GraphHelper
-
 import pytest
 
 from rdflib import Graph, Namespace
 from rdflib.namespace import RDF, RDFS
 from rdflib.term import Literal, URIRef
+from test.data import TEST_DATA_DIR
+from test.utils import BNodeHandling, GraphHelper
 
 EXAMPLE_GRAPH_FILE_PATH = TEST_DATA_DIR / "spec" / "cbd" / "example_graph.rdf"
 EXAMPLE_GRAPH_CBD_FILE_PATH = TEST_DATA_DIR / "spec" / "cbd" / "example_graph_cbd.rdf"

diff --git a/test/test_graph/test_graph_generators.py b/test/test_graph/test_graph_generators.py
@@ -1,7 +1,7 @@
 import os
-from test.data import BOB, CHEESE, HATES, LIKES, MICHEL, PIZZA, TAREK, TEST_DATA_DIR
 
 from rdflib import Graph
+from test.data import BOB, CHEESE, HATES, LIKES, MICHEL, PIZZA, TAREK, TEST_DATA_DIR
 
 timblcardn3 = open(os.path.join(TEST_DATA_DIR, "timbl-card.n3")).read()
 

diff --git a/test/test_graph/test_graph_http.py b/test/test_graph/test_graph_http.py
@@ -3,6 +3,11 @@
 import logging
 import re
 from http.server import BaseHTTPRequestHandler
+from urllib.error import HTTPError
+
+import pytest
+
+from rdflib import Graph
 from test.data import TEST_DATA_DIR
 from test.utils import GraphHelper
 from test.utils.graph import cached_graph
@@ -16,11 +21,6 @@
 from test.utils.httpservermock import ServedBaseHTTPServerMock
 from test.utils.namespace import EGDO
 from test.utils.wildcard import URL_PARSE_RESULT_WILDCARD
-from urllib.error import HTTPError
-
-import pytest
-
-from rdflib import Graph
 
 """
 Test that correct content negotiation headers are passed

diff --git a/test/test_graph/test_graph_redirect.py b/test/test_graph/test_graph_redirect.py
@@ -1,13 +1,13 @@
 from __future__ import annotations
 
-from test.data import SIMPLE_TRIPLE_GRAPH, TEST_DATA_DIR
-from test.utils import GraphHelper
-from test.utils.http import MethodName, MockHTTPResponse
-from test.utils.httpservermock import ServedBaseHTTPServerMock
 from typing import Tuple
 from urllib.parse import urlparse
 
 from rdflib.graph import Graph
+from test.data import SIMPLE_TRIPLE_GRAPH, TEST_DATA_DIR
+from test.utils import GraphHelper
+from test.utils.http import MethodName, MockHTTPResponse
+from test.utils.httpservermock import ServedBaseHTTPServerMock
 
 
 def test_graph_redirect_new_host(

diff --git a/test/test_graph/test_graph_store.py b/test/test_graph/test_graph_store.py
@@ -6,7 +6,6 @@
 
 import itertools
 import logging
-from test.data import SIMPLE_TRIPLE_GRAPH
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -32,6 +31,7 @@
 from rdflib.query import Result
 from rdflib.store import Store
 from rdflib.term import Identifier, URIRef, Variable
+from test.data import SIMPLE_TRIPLE_GRAPH
 
 if TYPE_CHECKING:
     from _pytest.mark.structures import ParameterSet

diff --git a/test/test_graph/test_namespace_rebinding.py b/test/test_graph/test_namespace_rebinding.py
@@ -1,11 +1,10 @@
-from test.data import CONTEXT1, CONTEXT2, TAREK
-
 import pytest
 
 from rdflib import ConjunctiveGraph, Graph, Literal
 from rdflib.namespace import OWL, Namespace, NamespaceManager
 from rdflib.plugins.stores.memory import Memory
 from rdflib.term import URIRef
+from test.data import CONTEXT1, CONTEXT2, TAREK
 
 foaf1_uri = URIRef("http://xmlns.com/foaf/0.1/")
 foaf2_uri = URIRef("http://xmlns.com/foaf/2.0/")