Skip to content

Commit 9b2e517

Browse files
committed
Remove all trailing whitespace
Signed-off-by: Stefan Weil <sw@weilnetz.de>
1 parent cff8dda commit 9b2e517

File tree

31 files changed

+167
-167
lines changed

31 files changed

+167
-167
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- checkout
1818
- run: HOMEBREW_NO_AUTO_UPDATE=1 brew install imagemagick geos
19-
- run: make install
19+
- run: make install
2020
- run: make deps-test test benchmark
2121

2222
test-python36:

.github/workflows/docker-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ jobs:
3535
run: |
3636
docker push ghcr.io/ocrd/core:latest
3737
docker push ghcr.io/ocrd/core-cuda:latest
38-
38+

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,7 @@ Added:
10531053
* Workspace validation will check cardinality of images per file is 1, #243, OCR-D/spec#132
10541054

10551055
Changed:
1056-
1056+
10571057
* bashlib will no longer warn about "non-conformant" file group names, #365
10581058
* Invalid `file:/` URL will now raise exceptions, #373
10591059
* image_from_*: increase tolerance for size mismatch after rotation to 2px, #371

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LOG_LEVEL = INFO
77
PYTHONIOENCODING=utf8
88
TESTDIR = tests
99

10-
SPHINX_APIDOC =
10+
SPHINX_APIDOC =
1111

1212
BUILD_ORDER = ocrd_utils ocrd_models ocrd_modelfactory ocrd_validators ocrd
1313

@@ -52,7 +52,7 @@ DOCKER_TAG = ocrd/core
5252
DOCKER_BASE_IMAGE = ubuntu:20.04
5353

5454
# Additional arguments to docker build. Default: '$(DOCKER_ARGS)'
55-
DOCKER_ARGS =
55+
DOCKER_ARGS =
5656

5757
# pip install command. Default: $(PIP_INSTALL)
5858
PIP_INSTALL = $(PIP) install
-9 Bytes
Binary file not shown.

ocrd/ocrd/lib.bash

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
exit 1
44

55
## ### `ocrd__raise`
6-
##
6+
##
77
## Raise an error and exit.
88
ocrd__raise () {
99
echo >&2 "ERROR: $1"; exit 127
1010
}
1111

1212
## ### `ocrd__log`
13-
##
13+
##
1414
## Delegate logging to `ocrd log`
1515
ocrd__log () {
1616
local log_level="${ocrd__argv[log_level]:-}"
@@ -23,7 +23,7 @@ ocrd__log () {
2323

2424

2525
## ### `ocrd__minversion`
26-
##
26+
##
2727
## Ensure minimum version
2828
# ht https://stackoverflow.com/posts/4025065
2929
ocrd__minversion () {
@@ -53,48 +53,48 @@ ocrd__minversion () {
5353
}
5454

5555
## ### `ocrd__dumpjson`
56-
##
56+
##
5757
## Output ocrd-tool.json.
58-
##
58+
##
5959
## Requires `$OCRD_TOOL_JSON` and `$OCRD_TOOL_NAME` to be set:
60-
##
60+
##
6161
## ```sh
6262
## export OCRD_TOOL_JSON=/path/to/ocrd-tool.json
6363
## export OCRD_TOOL_NAME=ocrd-foo-bar
6464
## ```
65-
##
65+
##
6666
ocrd__dumpjson () {
6767
ocrd ocrd-tool "$OCRD_TOOL_JSON" tool "$OCRD_TOOL_NAME" dump
6868
}
6969

70-
##
70+
##
7171
## Output file resource content.
7272
##
7373
ocrd__show_resource () {
7474
ocrd ocrd-tool "$OCRD_TOOL_JSON" tool "$OCRD_TOOL_NAME" show-resource "$1"
7575
}
7676

77-
##
77+
##
7878
## Output file resources names.
7979
##
8080
ocrd__list_resources () {
8181
ocrd ocrd-tool "$OCRD_TOOL_JSON" tool "$OCRD_TOOL_NAME" list-resources
8282
}
8383

8484
## ### `ocrd__usage`
85-
##
85+
##
8686
## Print usage
87-
##
87+
##
8888
ocrd__usage () {
8989

9090
ocrd ocrd-tool "$OCRD_TOOL_JSON" tool "$OCRD_TOOL_NAME" help
9191

9292
}
9393

9494
## ### `ocrd__parse_argv`
95-
##
95+
##
9696
## Expects an associative array ("hash"/"dict") `ocrd__argv` to be defined:
97-
##
97+
##
9898
## ```sh
9999
## declare -A ocrd__argv=()
100100
## ```

ocrd/ocrd/processor/base.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class Processor():
4343
for run-time data processing. That is, it executes a single workflow step,
4444
or a combination of workflow steps, on the workspace (represented by local METS).
4545
It reads input files for all or requested physical pages of the input fileGrp(s),
46-
and writes output files for them into the output fileGrp(s). It may take
46+
and writes output files for them into the output fileGrp(s). It may take
4747
a number of optional or mandatory parameters.
4848
"""
4949

@@ -163,12 +163,12 @@ def verify(self):
163163

164164
def process(self):
165165
"""
166-
Process the :py:attr:`workspace`
166+
Process the :py:attr:`workspace`
167167
from the given :py:attr:`input_file_grp`
168168
to the given :py:attr:`output_file_grp`
169169
for the given :py:attr:`page_id`
170170
under the given :py:attr:`parameter`.
171-
171+
172172
(This contains the main functionality and needs to be overridden by subclasses.)
173173
"""
174174
raise Exception("Must be implemented")
@@ -279,7 +279,7 @@ def input_files(self):
279279
- Otherwise raise an error (complaining that only PAGE-XML warrants
280280
having multiple images for a single page)
281281
Algorithm <https://github.com/cisocrgroup/ocrd_cis/pull/57#issuecomment-656336593>_
282-
282+
283283
Returns:
284284
A list of :py:class:`ocrd_models.ocrd_file.OcrdFile` objects.
285285
"""

ocrd/ocrd/processor/helpers.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ def run_processor(
107107
mem_usage = memory_usage(proc=processor.process,
108108
# only run process once
109109
max_iterations=1,
110-
interval=.1, timeout=None, timestamps=True,
110+
interval=.1, timeout=None, timestamps=True,
111111
# include sub-processes
112-
multiprocess=True, include_children=True,
112+
multiprocess=True, include_children=True,
113113
# get proportional set size instead of RSS
114114
backend=backend)
115115
mem_usage_values = [mem for mem, _ in mem_usage]
@@ -198,7 +198,7 @@ def run_cli(
198198

199199
def generate_processor_help(ocrd_tool, processor_instance=None):
200200
"""Generate a string describing the full CLI of this processor including params.
201-
201+
202202
Args:
203203
ocrd_tool (dict): this processor's ``tools`` section of the module's ``ocrd-tool.json``
204204
processor_instance (object, optional): the processor implementation
@@ -281,7 +281,7 @@ def wrap(s):
281281

282282
# Taken from https://github.com/OCR-D/core/pull/884
283283
@freeze_args
284-
@lru_cache(maxsize=environ.get('OCRD_MAX_PROCESSOR_CACHE', 128))
284+
@lru_cache(maxsize=environ.get('OCRD_MAX_PROCESSOR_CACHE', 128))
285285
def get_cached_processor(parameter: dict, processor_class):
286286
"""
287287
Call this function to get back an instance of a processor.

ocrd/ocrd/resolver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def workspace_from_url(self, mets_url, dst_dir=None, clobber_mets=False, mets_ba
123123
download (boolean, False): Whether to also download all the files referenced by the METS
124124
src_baseurl (string, None): Base URL for resolving relative file locations
125125
126-
Download (clone) :py:attr:`mets_url` to ``mets.xml`` in :py:attr:`dst_dir`, unless
126+
Download (clone) :py:attr:`mets_url` to ``mets.xml`` in :py:attr:`dst_dir`, unless
127127
the former is already local and the latter is ``none`` or already identical to its directory name.
128128
129129
Returns:

ocrd/ocrd/resource_manager.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ def list_installed(self, executable=None):
168168
resdict = resdict_list[0]
169169
elif str(res_filename.parent) == moduledir:
170170
resdict = {
171-
'name': res_name,
172-
'url': str(res_filename),
173-
'description': 'Found at module',
171+
'name': res_name,
172+
'url': str(res_filename),
173+
'description': 'Found at module',
174174
'type': res_type,
175175
'size': res_size
176176
}

0 commit comments

Comments
 (0)