From dfc4ac2538654ef446beb69652ea64543db2cc93 Mon Sep 17 00:00:00 2001 From: Robert Sachunsky Date: Fri, 30 Aug 2024 22:46:51 +0200 Subject: [PATCH 1/3] setuptools: fix (packages.find.where prevented finding namespace qurator) --- pyproject.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 8f83249..9e610c4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,8 +37,5 @@ Repository = "https://github.com/qurator-spk/eynollah.git" [tool.setuptools.dynamic] dependencies = {file = ["requirements.txt"]} -[tool.setuptools.packages.find] -where = ["qurator"] - [tool.setuptools.package-data] "*" = ["*.json", '*.yml', '*.xml', '*.xsd'] From 1e902571ead1b8493376e2ca7d1dc401aefd929d Mon Sep 17 00:00:00 2001 From: Robert Sachunsky Date: Sun, 1 Sep 2024 10:15:11 +0200 Subject: [PATCH 2/3] undo customizing metadata_filename (not correct with namespace pkg support in core) --- qurator/eynollah/processor.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/qurator/eynollah/processor.py b/qurator/eynollah/processor.py index 01dd797..fd7dd2a 100644 --- a/qurator/eynollah/processor.py +++ b/qurator/eynollah/processor.py @@ -6,10 +6,6 @@ from .eynollah import Eynollah class EynollahProcessor(Processor): - @property - def metadata_filename(self) -> str: - return 'eynollah/ocrd-tool.json' - def setup(self) -> None: # for caching models self.models = None From 17eafc1ccb3980f2bedb5183d45942fc83a838ba Mon Sep 17 00:00:00 2001 From: Robert Sachunsky Date: Sun, 1 Sep 2024 10:15:31 +0200 Subject: [PATCH 3/3] adapt tool json to v3 --- qurator/eynollah/ocrd-tool.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qurator/eynollah/ocrd-tool.json b/qurator/eynollah/ocrd-tool.json index 127b95b..2da970d 100644 --- a/qurator/eynollah/ocrd-tool.json +++ b/qurator/eynollah/ocrd-tool.json @@ -6,8 +6,8 @@ "executable": "ocrd-eynollah-segment", "categories": ["Layout analysis"], "description": "Segment page into regions and lines and do reading order detection with eynollah", - "input_file_grp": ["OCR-D-IMG", "OCR-D-SEG-PAGE", "OCR-D-GT-SEG-PAGE"], - "output_file_grp": ["OCR-D-SEG-LINE"], + "input_file_grp_cardinality": 1, + "output_file_grp_cardinality": 1, "steps": ["layout/segmentation/region", "layout/segmentation/line"], "parameters": { "models": {