Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/OCR-D/core
Browse files Browse the repository at this point in the history
  • Loading branch information
kba committed Oct 10, 2024
2 parents 94e6d2c + 03018f7 commit d29c029
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ build:

# (Re)install the tool
install: #build
# not stricttly necessary but a precaution against outdated python build tools, https://github.com/OCR-D/core/pull/1166
# not strictly necessary but a precaution against outdated python build tools, https://github.com/OCR-D/core/pull/1166
$(PIP) install -U pip wheel
$(PIP_INSTALL) . $(PIP_INSTALL_CONFIG_OPTION)
@# workaround for shapely#1598
Expand Down
2 changes: 1 addition & 1 deletion src/ocrd/mets_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ def add_file(


class MpxReq:
"""This class wrapps the request bodies needed for the tcp forwarding
"""This class wraps the request bodies needed for the tcp forwarding
For every mets-server-call like find_files or workspace_path a special request_body is
needed to call `MetsServerProxy.forward_tcp_request`. These are created by this functions.
Expand Down
2 changes: 1 addition & 1 deletion src/ocrd_network/processing_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ async def forward_tcp_request_to_uds_mets_server(self, request: Request) -> Dict
"""Forward mets-server-request
A processor calls a mets related method like add_file with ClientSideOcrdMets. This sends
a request to this endpoint. This request contains all infomation neccessary to make a call
a request to this endpoint. This request contains all information necessary to make a call
to the uds-mets-server. This information is used by `MetsServerProxy` to make a the call
to the local (local for the processing-server) reachable the uds-mets-server.
"""
Expand Down
2 changes: 1 addition & 1 deletion tests/network/test_modules_mets_server_proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def test_find_files(start_uds_mets_server):
{"file_grp": test_file_group}
)
response_dict = MetsServerProxy().forward_tcp_request(request_body=request_body)
assert len(response_dict["files"]) == 3, "Expected to find exatly 3 matching files"
assert len(response_dict["files"]) == 3, "Expected to find exactly 3 matching files"
request_body = MpxReq.find_files(
TEST_WORKSPACE_DIR,
{"file_grp": test_non_existing_file_group}
Expand Down
2 changes: 1 addition & 1 deletion tests/test_resolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def test_workspace_from_url_kant_with_resources(mock_request, tmp_path):
@patch.object(Session, "get")
def test_workspace_from_url_kant_with_resources_existing_local(mock_request, tmp_path):
"""
Fail with clobber_mets=False, succeeed with clobber_mets=True
Fail with clobber_mets=False, succeed with clobber_mets=True
"""

# arrange
Expand Down
2 changes: 1 addition & 1 deletion tests/test_resource_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def test_resources_manager_from_environment(tmp_path, monkeypatch):
assert mgr.userdir == tmp_path


def test_resources_manager_config_explicite(tmp_path):
def test_resources_manager_config_explicit(tmp_path):

# act
from ocrd.resource_manager import OcrdResourceManager
Expand Down

0 comments on commit d29c029

Please sign in to comment.