ocrd 3.0.1__tar.gz → 3.0.2__tar.gz

{ocrd-3.0.1/src/ocrd.egg-info → ocrd-3.0.2}/PKG-INFO

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

ocrd-3.0.2/VERSION

@@ -0,0 +1 @@
+3.0.2

{ocrd-3.0.1 → ocrd-3.0.2}/src/ocrd/decorators/ocrd_cli_options.py

@@ -13,16 +13,16 @@ from ocrd_network import (
 
 def ocrd_cli_options(f):
     """
-    Implement MP CLI.
+    Implement Processor CLI.
 
     Usage::
 
-        import ocrd_click_cli from ocrd.utils
+        from ocrd.decorators import ocrd_cli_options
 
         @click.command()
-        @ocrd_click_cli
-        def cli(mets_url):
-            print(mets_url)
+        @ocrd_cli_options
+        def cli(**kwargs):
+            print(kwargs['mets_url'])
     """
     # XXX Note that the `--help` output is statically generate_processor_help
     params = [

{ocrd-3.0.1 → ocrd-3.0.2}/src/ocrd/processor/base.py

@@ -518,7 +518,7 @@ class Processor():
 
                 if max_workers > 1:
                     executor_cls = ProcessPoolExecutor
-                    log_queue = mp.Queue()
+                    log_queue = mp.get_context('fork').Queue()
                 else:
                     executor_cls = DummyExecutor
                     log_queue = None

{ocrd-3.0.1 → ocrd-3.0.2}/src/ocrd/workspace.py

@@ -798,7 +798,6 @@ class Workspace():
             raise Exception('Found no AlternativeImage that satisfies all requirements ' +
                             'filter="%s" in page "%s"' % (
                                 feature_filter, page_id))
-        page_image.format = 'PNG' # workaround for tesserocr#194
         # ensure DPI will be set in image meta-data again
         if 'DPI' in page_coords:
             dpi = page_coords['DPI']
@@ -1060,7 +1059,6 @@ class Workspace():
             raise Exception('Found no AlternativeImage that satisfies all requirements ' +
                             'filter="%s" in segment "%s"' % (
                                 feature_filter, segment.id))
-        segment_image.format = 'PNG' # workaround for tesserocr#194
         # ensure DPI will be set in image meta-data again
         if 'DPI' in segment_coords:
             dpi = segment_coords['DPI']

{ocrd-3.0.1 → ocrd-3.0.2/src/ocrd.egg-info}/PKG-INFO

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

{ocrd-3.0.1 → ocrd-3.0.2}/src/ocrd_utils/config.py

@@ -142,7 +142,7 @@ config.add('OCRD_MAX_PROCESSOR_CACHE',
     default=(True, 128))
 
 config.add('OCRD_MAX_PARALLEL_PAGES',
-    description="Maximum number of processor threads for page-parallel processing (within each Processor's selected page range, independent of the number of Processing Workers or Processor Servers). If set >1, then a METS Server must be used for METS synchronisation.",
+    description="Maximum number of processor workers for page-parallel processing (within each Processor's selected page range, independent of the number of Processing Workers or Processor Servers). If set >1, then a METS Server must be used for METS synchronisation.",
     parser=int,
     default=(True, 1))
 

ocrd-3.0.1/VERSION

@@ -1 +0,0 @@
-3.0.1

{ocrd-3.0.1 → ocrd-3.0.2}/src/ocrd_network/cli/client.py

@@ -110,8 +110,8 @@ def check_processing_job_status(address: Optional[str], processing_job_id: str):
 @click.option('-p', '--print-state', default=False, is_flag=True,
               help='If set, the client will print job states by each iteration.')
 def send_processing_job_request(
-    address: Optional[str],
     processor_name: str,
+    address: Optional[str],
     mets: str,
     input_file_grp: str,
     output_file_grp: Optional[str],