Skip to content

Commit

Permalink
Remove newly introduced trailing whitespace
Browse files Browse the repository at this point in the history
Signed-off-by: Stefan Weil <[email protected]>
  • Loading branch information
stweil committed Jun 26, 2023
1 parent 5d92cdb commit 13900eb
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
steps:
- checkout
- run: sudo apt-get -y update
- run: sudo make deps-ubuntu
- run: sudo make deps-ubuntu
- run: make install deps-test
- run: make test benchmark

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ pyclean:
.PHONY: docker docker-cuda

# Additional arguments to docker build. Default: '$(DOCKER_ARGS)'
DOCKER_ARGS =
DOCKER_ARGS =

# Build docker image
docker: DOCKER_BASE_IMAGE = ubuntu:20.04
Expand All @@ -278,7 +278,7 @@ docker-cuda: DOCKER_FILE = Dockerfile.cuda

docker-cuda: docker

docker docker-cuda:
docker docker-cuda:
docker build --progress=plain -f $(DOCKER_FILE) -t $(DOCKER_TAG) --build-arg BASE_IMAGE=$(DOCKER_BASE_IMAGE) $(DOCKER_ARGS) .

# Build wheels and source dist and twine upload them
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -265,9 +265,9 @@ To be used in a **loop over all selected pages**:
local in_pageId=($(ocrd__input_file $n pageId))
local out_id=$(ocrd__input_file $n outputFileId)
local out_fpath="${ocrd__argv[output_file_grp]}/${out_id}.xml

# process $in_fpath to $out_fpath ...

declare -a options
if [ -n "$in_pageId" ]; then
options=( -g $in_pageId )
Expand All @@ -285,11 +285,11 @@ To be used in a **loop over all selected pages**:
> **Note**: If the `--input-file-grp` is **multi-valued** (N fileGrps separated by commas),
> then usage is similar:
> * The function `ocrd__input_file` can be used, but
> its results will be **lists** (delimited by whitespace and surrounded by single quotes),
> its results will be **lists** (delimited by whitespace and surrounded by single quotes),
> e.g. `[url]='file1.xml file2.xml' [ID]='id_file1 id_file2' [mimetype]='application/vnd.prima.page+xml image/tiff' ...`.
> * Therefore its results should be encapsulated in a (non-associative) **array variable**
> and without extra quotes, e.g. `in_file=($(ocrd__input_file 3 url))`, or as shown above.
> * This will yield the first fileGrp's results on index 0,
> * This will yield the first fileGrp's results on index 0,
> which in bash will always be the same as if you referenced the array without index
> (so code does not need to be changed much), e.g. `test -f $in_file` which equals `test -f ${in_file[0]}`.
> * Additional fileGrps will have to be fetched from higher indexes, e.g. `test -f ${in_file[1]}`.
Expand Down
8 changes: 4 additions & 4 deletions ocrd_network/ocrd_network/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
# For reference, currently:
# 1. The WebAPI is available here: https://github.com/OCR-D/ocrd-webapi-implementation
# The ocrd-webapi-implementation repo implements the Discovery / Workflow / Workspace endpoints of the WebAPI currently.
# This Processing Server PR implements just the Processor endpoint of the WebAPI.
# Once we have this merged to core under ocrd-network, the other endpoints will be adapted to ocrd-network
# This Processing Server PR implements just the Processor endpoint of the WebAPI.
# Once we have this merged to core under ocrd-network, the other endpoints will be adapted to ocrd-network
# and then the ocrd-webapi-implementation repo can be archived for reference.

# 2. The RabbitMQ Library (i.e., utils) is used as an API to abstract and
# 2. The RabbitMQ Library (i.e., utils) is used as an API to abstract and
# simplify (from the view point of processing server and workers) interactions with the RabbitMQ Server.
# The library was adopted from: https://github.com/OCR-D/ocrd-webapi-implementation/tree/main/ocrd_webapi/rabbitmq

# 3. Some potentially more useful code to be adopted for the Processing Server/Worker is available here:
# https://github.com/OCR-D/core/pull/884
# Update: Should be revisited again for adopting any relevant parts (if necessary).
# Update: Should be revisited again for adopting any relevant parts (if necessary).
# Nothing relevant is under the radar for now.

# 4. The Mets Server discussion/implementation is available here:
Expand Down
2 changes: 1 addition & 1 deletion ocrd_network/ocrd_network/processing_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ async def push_to_processor_server(self, processor_name: str, job_input: PYJobIn
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
detail=f"Failed to json dump the PYJobInput, error: {e}"
)

# TODO: The amount of pages should come as a request input
# TODO: cf https://github.com/OCR-D/core/pull/1030/files#r1152551161
# currently, use 200 as a default
Expand Down
2 changes: 1 addition & 1 deletion ocrd_network/ocrd_network/processor_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ def get_version(self) -> str:
if self.version:
return self.version

"""
"""
if self.processor_class:
# The way of accessing the version like in the line below may be problematic
# version_str = self.processor_class(workspace=None, version=True).version
Expand Down
2 changes: 1 addition & 1 deletion tests/cli/test_bashlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def invoke_bash(self, script, *args, executable=None):
return -1, "", str(e)
finally:
os.remove(scriptfile.name)

def setUp(self):
self.maxDiff = None
super().setUp()
Expand Down

0 comments on commit 13900eb

Please sign in to comment.