From 5204afbb855730c9834dfd2cd2593f0afd8037b6 Mon Sep 17 00:00:00 2001 From: "Francesca.L.Bleken@sintef.no" Date: Wed, 19 Feb 2025 13:40:26 +0100 Subject: [PATCH 1/2] disable pylint errors on too-many-positional-arguments --- pyproject.toml | 6 +++--- tripper/backends/ontopy.py | 2 +- tripper/backends/rdflib.py | 2 +- tripper/convert/convert.py | 6 +++--- tripper/datadoc/dataaccess.py | 4 +++- tripper/datadoc/dataset.py | 2 +- tripper/datadoc/tabledoc.py | 4 ++-- tripper/mappings/mappings.py | 6 +++--- tripper/namespace.py | 2 +- tripper/triplestore.py | 16 +++++++++------- tripper/triplestore_extend.py | 6 +++--- 11 files changed, 30 insertions(+), 26 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 19093fcc..1518b6b9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,11 +45,11 @@ datadoc = [ ] pre-commit = [ "pre-commit==4.0.1", - "pylint==2.15.5", + "pylint==3.3.4", ] testing-core = [ - "pytest==7.4.4", - "pytest-cov==4.1.0", + "pytest==8.3.4", + "pytest-cov==6.0.0", ] testing = [ "tripper[testing-core,mappings,datadoc]", diff --git a/tripper/backends/ontopy.py b/tripper/backends/ontopy.py index 5cf8d393..f9b0004b 100644 --- a/tripper/backends/ontopy.py +++ b/tripper/backends/ontopy.py @@ -138,7 +138,7 @@ def remove(self, triple: "Triple"): self.onto._del_obj_triple_spo(s, p, o) # Optional methods - def parse( + def parse( # pylint: disable=too-many-positional-arguments self, source=None, location=None, diff --git a/tripper/backends/rdflib.py b/tripper/backends/rdflib.py index 2364a88f..4f67af68 100644 --- a/tripper/backends/rdflib.py +++ b/tripper/backends/rdflib.py @@ -71,7 +71,7 @@ class RdflibStrategy: prefer_sparql = False - def __init__( + def __init__( # pylint: disable=too-many-positional-arguments self, base_iri: "Optional[str]" = None, # pylint: disable=unused-argument database: "Optional[str]" = None, diff --git a/tripper/convert/convert.py b/tripper/convert/convert.py index cf949f59..688b161a 100644 --- a/tripper/convert/convert.py +++ b/tripper/convert/convert.py @@ -188,7 +188,7 @@ def get_obj_iri(obj, uuid): return rdf -def save_container( +def save_container( # pylint: disable=too-many-positional-arguments ts: "Triplestore", container: "Union[Mapping[str, Any], Sequence[Any]]", iri: str, @@ -330,7 +330,7 @@ def get_obj(value): # === Deprecated functions === -def from_dict( +def from_dict( # pylint: disable=too-many-positional-arguments dct: dict, iri: str, bases: "Optional[Sequence]" = None, @@ -367,7 +367,7 @@ def from_dict( ) -def save_dict( +def save_dict( # pylint: disable=too-many-positional-arguments ts: "Triplestore", dct: "Mapping[str, Any]", iri: str, diff --git a/tripper/datadoc/dataaccess.py b/tripper/datadoc/dataaccess.py index dcd412b6..d1af1766 100644 --- a/tripper/datadoc/dataaccess.py +++ b/tripper/datadoc/dataaccess.py @@ -12,6 +12,8 @@ package. """ +from __future__ import annotations + import secrets # From Python 3.9 we could use random.randbytes(16).hex() from typing import TYPE_CHECKING from urllib.parse import urlparse @@ -24,7 +26,7 @@ from typing import Any, Iterable, List, Mapping, Optional, Sequence, Union -def save( +def save( # pylint: disable=too-many-positional-arguments ts: Triplestore, data: bytes, class_iri: "Optional[str]" = None, diff --git a/tripper/datadoc/dataset.py b/tripper/datadoc/dataset.py index b1532e2a..b6bf0b2a 100644 --- a/tripper/datadoc/dataset.py +++ b/tripper/datadoc/dataset.py @@ -751,7 +751,7 @@ def as_jsonld( return d -def get_partial_pipeline( +def get_partial_pipeline( # pylint: disable=too-many-positional-arguments ts: Triplestore, client, iri: str, diff --git a/tripper/datadoc/tabledoc.py b/tripper/datadoc/tabledoc.py index f6933968..86dc970e 100644 --- a/tripper/datadoc/tabledoc.py +++ b/tripper/datadoc/tabledoc.py @@ -52,7 +52,7 @@ class TableDoc: # pylint: disable=redefined-builtin,too-few-public-methods - def __init__( + def __init__( # pylint: disable=too-many-positional-arguments self, header: "Sequence[str]", data: "Sequence[Sequence[str]]", @@ -200,7 +200,7 @@ def addheaddict(d, prefix=""): ) @staticmethod - def parse_csv( + def parse_csv( # pylint: disable=too-many-positional-arguments csvfile: "Union[Iterable[str], Path, str]", type: "Optional[str]" = "dataset", prefixes: "Optional[dict]" = None, diff --git a/tripper/mappings/mappings.py b/tripper/mappings/mappings.py index b319e7f5..5f234269 100644 --- a/tripper/mappings/mappings.py +++ b/tripper/mappings/mappings.py @@ -90,7 +90,7 @@ class Value: # pylint: disable=too-few-public-methods - def __init__( + def __init__( # pylint: disable=too-many-positional-arguments self, value: "Any" = None, unit: "Optional[str]" = None, @@ -204,7 +204,7 @@ class MappingStep: # pylint: disable=too-many-instance-attributes - def __init__( + def __init__( # pylint: disable=too-many-positional-arguments self, output_iri: str, steptype: "StepType" = StepType.UNSPECIFIED, @@ -757,7 +757,7 @@ def fno_mapper(triplestore: "Triplestore") -> "Dict[str, list]": return d -def mapping_routes( +def mapping_routes( # pylint: disable=too-many-positional-arguments target: str, sources: "Union[Dict[str, Union[Value, None]], Sequence[str]]", triplestore: "Triplestore", diff --git a/tripper/namespace.py b/tripper/namespace.py index ce58b86c..5e1b2919 100644 --- a/tripper/namespace.py +++ b/tripper/namespace.py @@ -56,7 +56,7 @@ class Namespace: "_format", # Format to use when loading from a triplestore ) - def __init__( + def __init__( # pylint: disable=too-many-positional-arguments self, iri: str, label_annotations: "Union[Sequence, bool]" = (), diff --git a/tripper/triplestore.py b/tripper/triplestore.py index 1de730ad..1f553464 100644 --- a/tripper/triplestore.py +++ b/tripper/triplestore.py @@ -228,7 +228,9 @@ def _load_backend(cls, backend: str, package: "Optional[str]" = None): # Installed backend package if sys.version_info < (3, 10): # Fallback for Python < 3.10 - eps = entry_points().get("tripper.backends", ()) + eps = entry_points().get( # pylint: disable=no-member + "tripper.backends", () + ) else: # New entry_point interface from Python 3.10+ eps = entry_points( # pylint: disable=unexpected-keyword-arg @@ -611,7 +613,7 @@ def add(self, triple: "Triple"): """Add `triple` to triplestore.""" self.add_triples([triple]) - def value( # pylint: disable=redefined-builtin + def value( # pylint: disable=redefined-builtin,too-many-positional-arguments self, subject=None, predicate=None, @@ -822,7 +824,7 @@ def prefix_iri(self, iri: str, require_prefixed: bool = False): "value": (OWL.hasValue, None), } - def add_restriction( # pylint: disable=redefined-builtin + def add_restriction( # pylint: disable=redefined-builtin,too-many-positional-arguments self, cls: str, property: str, @@ -884,7 +886,7 @@ def add_restriction( # pylint: disable=redefined-builtin self.add_triples(triples) return iri - def restrictions( # pylint: disable=redefined-builtin + def restrictions( # pylint: disable=redefined-builtin,too-many-positional-arguments self, cls: "Optional[str]" = None, property: "Optional[str]" = None, @@ -1025,7 +1027,7 @@ def map( target_cost=target_cost, ) - def add_mapsTo( + def add_mapsTo( # pylint: disable=too-many-positional-arguments self, target: str, source: str, @@ -1169,7 +1171,7 @@ def eval_function(self, func_iri, args=(), kwargs=None) -> "Any": return result - def add_function( + def add_function( # pylint: disable=too-many-positional-arguments self, func: "Union[Callable, str]", expects: "Union[str, Sequence, Mapping]" = (), @@ -1244,7 +1246,7 @@ def add_function( return func_iri - def _add_function_doc( + def _add_function_doc( # pylint: disable=too-many-positional-arguments self, func_iri: "str", func: "Optional[Callable]" = None, diff --git a/tripper/triplestore_extend.py b/tripper/triplestore_extend.py index 2da687b5..a77b0ac4 100644 --- a/tripper/triplestore_extend.py +++ b/tripper/triplestore_extend.py @@ -36,7 +36,7 @@ class Tripper(Triplestore): such as get_value, add_data and add_interpolation_source. """ - def add_data( + def add_data( # pylint: disable=too-many-positional-arguments self, func: "Union[Callable, Literal]", iri: "Optional[Union[str, Sequence]]" = None, @@ -121,7 +121,7 @@ def fn(): return data_source - def get_value( + def get_value( # pylint: disable=too-many-positional-arguments self, iri, routeno=0, @@ -209,7 +209,7 @@ def get_value( quantity=quantity, ) - def add_interpolation_source( # pylint: disable=too-many-arguments + def add_interpolation_source( # pylint: disable=too-many-positional-arguments,too-many-arguments self, xcoord: str, ycoord: str, From 79d3c68de9e008c5b40a2e67bd5773814a31ec6f Mon Sep 17 00:00:00 2001 From: "Francesca.L.Bleken@sintef.no" Date: Wed, 19 Feb 2025 13:46:21 +0100 Subject: [PATCH 2/2] Python3.8 dependency on testing-ore --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 1518b6b9..96609527 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,7 +49,8 @@ pre-commit = [ ] testing-core = [ "pytest==8.3.4", - "pytest-cov==6.0.0", + "pytest-cov==5.0.0; python_version<'3.9'", + "pytest-cov==6.0.0; python_version>='3.9'", ] testing = [ "tripper[testing-core,mappings,datadoc]",