expose ocrd-tool.json for ocrd-dummy in root like processors

OCR-D · Jan 19, 2024 · de11f8f · de11f8f
1 parent e943eda
commit de11f8f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/ocrd-tool.json b/ocrd-tool.json
@@ -0,0 +1 @@
+./ocrd/ocrd/processor/builtin/dummy/ocrd-tool.json
diff --git a/ocrd/ocrd/processor/builtin/dummy/ocrd-tool.json b/ocrd/ocrd/processor/builtin/dummy/ocrd-tool.json
@@ -1,15 +1,19 @@
 {
-  "executable": "ocrd-dummy",
-  "description": "Bare-bones processor creates PAGE-XML and optionally copies file from input group to output group",
-  "steps": ["preprocessing/optimization"],
-  "categories": ["Image preprocessing"],
-  "input_file_grp": "DUMMY_INPUT",
-  "output_file_grp": "DUMMY_OUTPUT",
-  "parameters": {
-    "copy_files": {
-      "type": "boolean",
-      "default": false,
-      "description": "Whether to actually copy files (true) or just create PAGE-XML as a side effect (false)"
+  "tools": {
+    "ocrd-dummy": {
+      "executable": "ocrd-dummy",
+      "description": "Bare-bones processor creates PAGE-XML and optionally copies file from input group to output group",
+      "steps": ["preprocessing/optimization"],
+      "categories": ["Image preprocessing"],
+      "input_file_grp": "DUMMY_INPUT",
+      "output_file_grp": "DUMMY_OUTPUT",
+      "parameters": {
+        "copy_files": {
+          "type": "boolean",
+          "default": false,
+          "description": "Whether to actually copy files (true) or just create PAGE-XML as a side effect (false)"
+        }
+      }
     }
   }
 }
diff --git a/ocrd/ocrd/processor/builtin/dummy_processor.py b/ocrd/ocrd/processor/builtin/dummy_processor.py
@@ -79,7 +79,7 @@ def process(self):
 
 
     def __init__(self, *args, **kwargs):
-        kwargs['ocrd_tool'] = OCRD_TOOL
+        kwargs['ocrd_tool'] = OCRD_TOOL['tools']['ocrd-dummy']
         kwargs['version'] = '0.0.3'
         super(DummyProcessor, self).__init__(*args, **kwargs)
 

diff --git a/tests/cli/test_bashlib.py b/tests/cli/test_bashlib.py
@@ -1,6 +1,5 @@
 from tests.base import CapturingTestCase as TestCase, main, assets, copy_of_directory
 
-from pkg_resources import parse_version
 import os, sys
 import traceback
 import subprocess
@@ -103,8 +102,8 @@ def test_bashlib_minversion(self):
         exit_code, out, err = self.invoke_bash(
             "source $(ocrd bashlib filename) && ocrd__minversion 2.29.0")
         assert exit_code == 0
-        version = parse_version(VERSION)
-        version = "%d.%d.%d" % (version.major, version.minor+1, 0)
+        major, minor = map(int, VERSION.split('.')[0:2])
+        version = "%d.%d.%d" % (major, minor + 1, 0)
         exit_code, out, err = self.invoke_bash(
             "source $(ocrd bashlib filename) && ocrd__minversion " + version)
         assert exit_code > 0
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		./ocrd/ocrd/processor/builtin/dummy/ocrd-tool.json