ocrd 3.0.4__tar.gz → 3.1.0__tar.gz

{ocrd-3.0.4/src/ocrd.egg-info → ocrd-3.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ocrd
-Version: 3.0.4
+Version: 3.1.0
 Summary: OCR-D framework
 Author-email: Konstantin Baierer <unixprog@gmail.com>
 License: Apache License 2.0

ocrd-3.1.0/VERSION

@@ -0,0 +1 @@
+3.1.0

{ocrd-3.0.4 → ocrd-3.1.0}/src/ocrd/cli/ocrd_tool.py

@@ -95,6 +95,15 @@ def ocrd_tool_list(ctx):
     for tool in ctx.json['tools']:
         print(tool)
 
+# ----------------------------------------------------------------------
+# ocrd ocrd-tool dump-tools
+# ----------------------------------------------------------------------
+
+@ocrd_tool_cli.command('dump-tools', help="Dump tools")
+@pass_ocrd_tool
+def ocrd_tool_dump(ctx):
+    print(dumps(ctx.json['tools'], indent=True))
+
 # ----------------------------------------------------------------------
 # ocrd ocrd-tool tool
 # ----------------------------------------------------------------------

{ocrd-3.0.4 → ocrd-3.1.0}/src/ocrd/cli/resmgr.py

@@ -13,7 +13,15 @@ from yaml import safe_load, safe_dump
 import requests
 import click
 
-from ocrd_utils import directory_size, getLogger, get_moduledir, get_ocrd_tool_json, initLogging, RESOURCE_LOCATIONS
+from ocrd_utils import (
+    directory_size,
+    getLogger,
+    get_moduledir,
+    get_ocrd_tool_json,
+    resource_filename,
+    initLogging,
+    RESOURCE_LOCATIONS,
+)
 from ocrd.constants import RESOURCE_USER_LIST_COMMENT
 
 from ..resource_manager import OcrdResourceManager

{ocrd-3.0.4 → ocrd-3.1.0}/src/ocrd/processor/base.py

@@ -306,7 +306,6 @@ class Processor():
             input_file_grp=None,
             output_file_grp=None,
             page_id=None,
-            download_files=config.OCRD_DOWNLOAD_INPUT,
             version=None
     ):
         """
@@ -331,8 +330,6 @@ class Processor():
                  (or empty for all pages). \
                  Deprecated since version 3.0: Should be ``None`` here, but then needs to be set \
                  before processing.
-             download_files (boolean): Whether input files will be downloaded prior to processing, \
-                 defaults to :py:attr:`ocrd_utils.config.OCRD_DOWNLOAD_INPUT` which is ``True`` by default
         """
         if ocrd_tool is not None:
             deprecation_warning("Passing 'ocrd_tool' as keyword argument to Processor is deprecated - "
@@ -361,7 +358,7 @@ class Processor():
             deprecation_warning("Passing a page_id kwarg other than 'None' to Processor "
                                 "is deprecated - pass as argument to process_workspace instead")
             self.page_id = page_id or None
-        self.download = download_files
+        self.download = config.OCRD_DOWNLOAD_INPUT
         #: The logger to be used by processor implementations.
         # `ocrd.processor.base` internals should use :py:attr:`self._base_logger`
         self.logger = getLogger(f'ocrd.processor.{self.__class__.__name__}')

{ocrd-3.0.4 → ocrd-3.1.0/src/ocrd.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ocrd
-Version: 3.0.4
+Version: 3.1.0
 Summary: OCR-D framework
 Author-email: Konstantin Baierer <unixprog@gmail.com>
 License: Apache License 2.0

{ocrd-3.0.4 → ocrd-3.1.0}/src/ocrd_validators/ocrd_tool.schema.yml

@@ -175,6 +175,7 @@ properties:
             items:
               type: string
               enum:
+                - preprocessing/format-conversion
                 - preprocessing/characterization
                 - preprocessing/optimization
                 - preprocessing/optimization/cropping
@@ -193,6 +194,10 @@ properties:
                 - layout/segmentation/word
                 - layout/segmentation/classification
                 - layout/analysis
+                - postprocessing/format-conversion
+                - postprocessing/archival
+                - evaluation/layout
+                - evaluation/text
           resource_locations:
             type: array
             description: The locations in the filesystem this processor supports for resource lookup

ocrd-3.0.4/VERSION

@@ -1 +0,0 @@
-3.0.4