From dc339849eaedfd911ce2fd321dbd09df8a2d5f07 Mon Sep 17 00:00:00 2001 From: "i.nueske" <i.nueske@indiscale.com> Date: Tue, 1 Apr 2025 13:15:09 +0200 Subject: [PATCH 1/3] FIX: Always import CredentialsAuthenticator, ignore linting errors on version import --- src/linkahead/__init__.py | 2 +- src/linkahead/connection/connection.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/linkahead/__init__.py b/src/linkahead/__init__.py index 567748e3..97203a20 100644 --- a/src/linkahead/__init__.py +++ b/src/linkahead/__init__.py @@ -55,7 +55,7 @@ from .utils.get_entity import (get_entity_by_id, get_entity_by_name, get_entity_by_path) try: - from .version import version as __version__ + from .version import version as __version_ # pylint: disable=import-error except ModuleNotFoundError: version = "uninstalled" __version__ = version diff --git a/src/linkahead/connection/connection.py b/src/linkahead/connection/connection.py index 74dd2317..1bee0b77 100644 --- a/src/linkahead/connection/connection.py +++ b/src/linkahead/connection/connection.py @@ -47,7 +47,7 @@ from ..exceptions import (ConfigurationError, HTTPClientError, LoginFailedError) try: - from ..version import version + from ..version import version # pylint: disable=import-error except ModuleNotFoundError: version = "uninstalled" @@ -56,11 +56,12 @@ from .interface import CaosDBHTTPResponse, CaosDBServerConnection from .utils import make_uri_path, urlencode from typing import TYPE_CHECKING +from .authentication.interface import CredentialsAuthenticator if TYPE_CHECKING: from typing import Optional, Any, Iterator, Union from requests.models import Response from ssl import _SSLMethod - from .authentication.interface import AbstractAuthenticator, CredentialsAuthenticator + from .authentication.interface import AbstractAuthenticator _LOGGER = logging.getLogger(__name__) -- GitLab From dfc66218e2d5c213344093d84f376a7116eb8521 Mon Sep 17 00:00:00 2001 From: "i.nueske" <i.nueske@indiscale.com> Date: Tue, 1 Apr 2025 13:34:33 +0200 Subject: [PATCH 2/3] FIX: Ignore false positive linting warnings --- src/linkahead/connection/connection.py | 2 +- src/linkahead/connection/encode.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/linkahead/connection/connection.py b/src/linkahead/connection/connection.py index 1bee0b77..fe99b421 100644 --- a/src/linkahead/connection/connection.py +++ b/src/linkahead/connection/connection.py @@ -60,7 +60,7 @@ from .authentication.interface import CredentialsAuthenticator if TYPE_CHECKING: from typing import Optional, Any, Iterator, Union from requests.models import Response - from ssl import _SSLMethod + from ssl import _SSLMethod # pylint: disable=no-name-in-module from .authentication.interface import AbstractAuthenticator diff --git a/src/linkahead/connection/encode.py b/src/linkahead/connection/encode.py index a7619780..0cbb0b69 100644 --- a/src/linkahead/connection/encode.py +++ b/src/linkahead/connection/encode.py @@ -384,7 +384,7 @@ class MultipartYielder(object): # since python 3 def __next__(self): - return self.next() + return self.next() # pylint: disable=not-callable def next(self): """generator function to yield multipart/form-data representation of -- GitLab From d3b90636156c8d99bf9e6357387bf42e1bd3b1e2 Mon Sep 17 00:00:00 2001 From: "i.nueske" <i.nueske@indiscale.com> Date: Tue, 1 Apr 2025 13:45:35 +0200 Subject: [PATCH 3/3] FIX: Revert accidental rename --- src/linkahead/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/linkahead/__init__.py b/src/linkahead/__init__.py index 97203a20..ac8df123 100644 --- a/src/linkahead/__init__.py +++ b/src/linkahead/__init__.py @@ -55,7 +55,7 @@ from .utils.get_entity import (get_entity_by_id, get_entity_by_name, get_entity_by_path) try: - from .version import version as __version_ # pylint: disable=import-error + from .version import version as __version__ # pylint: disable=import-error except ModuleNotFoundError: version = "uninstalled" __version__ = version -- GitLab