Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ jobs:
- '3.12'
os:
- ubuntu-22.04
- ubuntu-20.04
- macos-latest

steps:
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ deps-torch:

# Dependencies for deployment in an ubuntu/debian linux
deps-ubuntu:
apt-get update
apt-get install -y python3 imagemagick libgeos-dev libxml2-dev libxslt-dev libssl-dev

# Dependencies for deployment via Conda
Expand Down
6 changes: 3 additions & 3 deletions src/ocrd/decorators/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@ def resolve(name):
if 'parameter_override' in kwargs:
set_json_key_value_overrides(kwargs['parameter'], *kwargs.pop('parameter_override'))
# Assert -I / -O
if not kwargs['input_file_grp']:
if not kwargs.get('input_file_grp', None):
raise ValueError('-I/--input-file-grp is required')
if not kwargs['output_file_grp']:
raise ValueError('-O/--output-file-grp is required')
if 'output_file_grp' not in kwargs:
raise ValueError('-O/--output-file-grp is required') # actually, it may be None
resolver = Resolver()
working_dir, mets, _, mets_server_url = \
resolver.resolve_mets_arguments(working_dir, mets, None, mets_server_url)
Expand Down
2 changes: 1 addition & 1 deletion src/ocrd/processor/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -1112,7 +1112,7 @@ def zip_input_files(self, require_first=True, mimetype=None, on_error='skip'):
if not ifiles[i]:
# could be from non-unique with on_error=skip or from true gap
self._base_logger.error(f'Found no file for page {page} in file group {ifg}')
if config.OCRD_MISSING_INPUT == 'abort':
if config.OCRD_MISSING_INPUT == 'ABORT':
raise MissingInputFile(ifg, page, mimetype)
if not any(ifiles):
# must be from non-unique with on_error=skip
Expand Down
1 change: 1 addition & 0 deletions src/ocrd/processor/builtin/dummy/ocrd-tool.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"version": "1.0.0",
"git_url": "https://github.com/OCR-D/core",
"dockerhub": "ocrd/core",
"tools": {
"ocrd-dummy": {
"executable": "ocrd-dummy",
Expand Down
4 changes: 2 additions & 2 deletions src/ocrd/processor/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ def get_processor(
# set current processing parameters
processor.workspace = workspace
processor.page_id = page_id
processor.input_file_grp = input_file_grp
processor.output_file_grp = output_file_grp
processor.input_file_grp = input_file_grp or ''
processor.output_file_grp = output_file_grp or ''
return processor
raise ValueError("Processor class is not known")
Loading