From ea99ef071a0077dd2fa902b0e8d79936a839cc84 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 29 Aug 2023 10:04:06 +0200 Subject: [PATCH 1/2] Format black --- papis_extract/extractor.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/papis_extract/extractor.py b/papis_extract/extractor.py index 9467231..88ff012 100644 --- a/papis_extract/extractor.py +++ b/papis_extract/extractor.py @@ -42,7 +42,7 @@ def start(filename: Path) -> list[Annotation]: def _tag_from_colorname(colorname: str) -> str: - color_mapping: dict[str,str] = getdict("tags", "plugins.extract") + color_mapping: dict[str, str] = getdict("tags", "plugins.extract") if not color_mapping: return "" @@ -82,6 +82,7 @@ def _retrieve_annotation_content( # just a highlight without any text return (None, None) + # mimics the functions in papis.config.{getlist,getint,getfloat} etc. def getdict(key: str, section: Optional[str] = None) -> dict[str, str]: """Dict getter @@ -97,13 +98,14 @@ def getdict(key: str, section: Optional[str] = None) -> dict[str, str]: rawvalue = eval(rawvalue) except Exception: raise SyntaxError( - "The key '{}' must be a valid Python object: {}" - .format(key, rawvalue)) + "The key '{}' must be a valid Python object: {}".format(key, rawvalue) + ) else: if not isinstance(rawvalue, dict): raise SyntaxError( - "The key '{}' must be a valid Python dict. Got: {} (type {!r})" - .format(key, rawvalue, type(rawvalue).__name__)) + "The key '{}' must be a valid Python dict. Got: {} (type {!r})".format( + key, rawvalue, type(rawvalue).__name__ + ) + ) return rawvalue - From c9a6030591b3fa6eb0c22f8831c5e7f67e447ab4 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 29 Aug 2023 10:04:21 +0200 Subject: [PATCH 2/2] Install poetry environment before pyright --- .woodpecker/static_analysis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker/static_analysis.yml b/.woodpecker/static_analysis.yml index bbb4fd1..3506c5c 100644 --- a/.woodpecker/static_analysis.yml +++ b/.woodpecker/static_analysis.yml @@ -3,6 +3,7 @@ pipeline: image: ghcr.io/withlogicco/poetry:1.5.1 commands: - pip install pyright + - poetry install - python --version && poetry --version && pyright --version - echo "------------- running pyright typecheck -------------" - poetry run pyright