Skip to content

Update Docker #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Update Docker #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0e22a92
serve: start maximised and without window decorations
bertsky May 23, 2024
0b7b0a1
dockerfile: py38 instead of py37
bertsky May 23, 2024
777ac41
tests: adapt to changes in core:26967052 (loglevel name)
bertsky May 23, 2024
9c54980
document: adapt to core@cfd1c915 (refresh_caches now hidden)
bertsky May 23, 2024
d8e3ffd
test_document test_save: workaround for core#1149
bertsky May 24, 2024
799d125
test_document test_save: workaround for core#1226
bertsky May 24, 2024
6112d74
tests/example METS files: use file paths instead of URLs
bertsky May 26, 2024
150faaa
docker-build: depend on update of gresources
bertsky May 30, 2024
e8f2388
PAGE view order arrows: avoid zero division when region is zero
bertsky Aug 28, 2024
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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.7
FROM python:3.8

WORKDIR /
COPY Makefile .
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ tests/assets: repo/assets
mkdir -p $@
cp -r -t $@ repo/assets/data/*

docker-build:
docker-build: ocrd_browser/ui.gresource
docker build --tag $(DOCKER_TAG) .

docker-run: DATADIR ?= $(CURDIR)
Expand Down
2 changes: 1 addition & 1 deletion ocrd_browser/model/document.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ def reorder(self, ordered_page_ids: List[str]) -> None:
page_sequence.append(div)

old_to_new = dict(zip(old_page_ids, self.page_ids))
self.workspace.mets.refresh_caches()
self.workspace.mets._refresh_caches()
self.save_mets()
self._emit('document_changed', 'reordered', old_to_new)

Expand Down
2 changes: 2 additions & 0 deletions ocrd_browser/model/page_xml_renderer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,8 @@ def paint(self, draw: ImageDraw.Draw, regions: RegionMap) -> None:
angle = radians(180.0 - 30) # 30 degrees
c, s = cos(angle), sin(angle)
d = self.p1[0] - self.p0[0], self.p1[1] - self.p0[1]
if d[0] == 0 and d[1] == 0:
return
left = d[0] * c - d[1] * s, d[0] * s + d[1] * c
right = d[0] * c + d[1] * s, -d[0] * s + d[1] * c
lf = self.size / (d[0] ** 2 + d[1] ** 2) ** 0.5
Expand Down
6 changes: 4 additions & 2 deletions serve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,10 @@ def _browse_workspace(self, path):
path = os.path.join(path, 'mets.xml')
## run app
Popen([which('browse-ocrd'),
'--display', ':' + str(self.bwport - 8080),
path])
'--maximize',
'--fullscreen',
'--display', ':' + str(self.bwport - 8080),
path])
## proxy does not work, because the follow-up requests would need to be forwarded, too:
# response = urllib.request.urlopen('http://' + self.bwhost + ':' + str(self.bwport))
# self.send_response(response.status)
Expand Down
2 changes: 1 addition & 1 deletion tests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
gi.require_version('WebKit2', '4.0')

initLogging()
setOverrideLogLevel('OFF', True)
setOverrideLogLevel('CRITICAL', True)

TEST_BASE_PATH = (Path(__file__).parent).absolute()
ASSETS_PATH = (TEST_BASE_PATH / 'assets').absolute()
Expand Down
8 changes: 4 additions & 4 deletions tests/example/workspaces/heavy quoting/mets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@
<mets:fileSec>
<mets:fileGrp USE="OCR-D-IMG">
<mets:file ID="INPUT_0017" MIMETYPE="image/tiff">
<mets:FLocat LOCTYPE="URL" xlink:href="OCR-D-IMG/INPUT 0017.tif"/>
<mets:FLocat LOCTYPE="OTHER" OTHERLOCTYPE="FILE" xlink:href="OCR-D-IMG/INPUT 0017.tif"/>
</mets:file>
<mets:file ID="INPUT_0020" MIMETYPE="image/tiff">
<mets:FLocat LOCTYPE="URL" xlink:href="OCR-D-IMG/INPUT 0020.tif"/>
<mets:FLocat LOCTYPE="OTHER" OTHERLOCTYPE="FILE" xlink:href="OCR-D-IMG/INPUT 0020.tif"/>
</mets:file>
</mets:fileGrp>
<mets:fileGrp USE="OCR-D-GT-PAGE">
<mets:file ID="PAGE_0017_PAGE" MIMETYPE="application/vnd.prima.page+xml">
<mets:FLocat LOCTYPE="URL" xlink:href="OCR-D-GT PÆGE/PAGE_0017 PÄGE.xml"/>
<mets:FLocat LOCTYPE="OTHER" OTHERLOCTYPE="FILE" xlink:href="OCR-D-GT PÆGE/PAGE_0017 PÄGE.xml"/>
</mets:file>
<mets:file ID="PAGE_0020_PAGE" MIMETYPE="application/vnd.prima.page+xml">
<mets:FLocat LOCTYPE="URL" xlink:href="OCR-D-GT PÆGE/PAGE_0020 PÄGE.xml"/>
<mets:FLocat LOCTYPE="OTHER" OTHERLOCTYPE="FILE" xlink:href="OCR-D-GT PÆGE/PAGE_0020 PÄGE.xml"/>
</mets:file>
</mets:fileGrp>
</mets:fileSec>
Expand Down
8 changes: 4 additions & 4 deletions tests/example/workspaces/kant_aufklaerung_1784_missing_image/mets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@
<mets:fileSec>
<mets:fileGrp USE="OCR-D-IMG">
<mets:file ID="INPUT_0017" MIMETYPE="image/tiff">
<mets:FLocat LOCTYPE="URL" xlink:href="OCR-D-IMG/INPUT_0017.tif"/>
<mets:FLocat LOCTYPE="OTHER" OTHERLOCTYPE="FILE" xlink:href="OCR-D-IMG/INPUT_0017.tif"/>
</mets:file>
<mets:file ID="INPUT_0020" MIMETYPE="image/tiff">
<mets:FLocat LOCTYPE="URL" xlink:href="OCR-D-IMG/INPUT_0020.tif"/>
<mets:FLocat LOCTYPE="OTHER" OTHERLOCTYPE="FILE" xlink:href="OCR-D-IMG/INPUT_0020.tif"/>
</mets:file>
</mets:fileGrp>
<mets:fileGrp USE="OCR-D-GT-PAGE">
<mets:file ID="PAGE_0017_PAGE" MIMETYPE="application/vnd.prima.page+xml">
<mets:FLocat LOCTYPE="URL" xlink:href="OCR-D-GT-PAGE/PAGE_0017_PAGE.xml"/>
<mets:FLocat LOCTYPE="OTHER" OTHERLOCTYPE="FILE" xlink:href="OCR-D-GT-PAGE/PAGE_0017_PAGE.xml"/>
</mets:file>
<mets:file ID="PAGE_0020_PAGE" MIMETYPE="application/vnd.prima.page+xml">
<mets:FLocat LOCTYPE="URL" xlink:href="OCR-D-GT-PAGE/PAGE_0020_PAGE.xml"/>
<mets:FLocat LOCTYPE="OTHER" OTHERLOCTYPE="FILE" xlink:href="OCR-D-GT-PAGE/PAGE_0020_PAGE.xml"/>
</mets:file>
</mets:fileGrp>
</mets:fileSec>
Expand Down
10 changes: 5 additions & 5 deletions tests/example/workspaces/kant_aufklaerung_1784_missing_xml/mets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,23 @@
<mets:fileSec>
<mets:fileGrp USE="OCR-D-IMG">
<mets:file ID="INPUT_0017" MIMETYPE="image/tiff">
<mets:FLocat LOCTYPE="URL" xlink:href="OCR-D-IMG/INPUT_0017.tif"/>
<mets:FLocat LOCTYPE="OTHER" OTHERLOCTYPE="FILE" xlink:href="OCR-D-IMG/INPUT_0017.tif"/>
</mets:file>
<mets:file ID="INPUT_0020" MIMETYPE="image/tiff">
<mets:FLocat LOCTYPE="URL" xlink:href="OCR-D-IMG/INPUT_0020.tif"/>
<mets:FLocat LOCTYPE="OTHER" OTHERLOCTYPE="FILE" xlink:href="OCR-D-IMG/INPUT_0020.tif"/>
</mets:file>
</mets:fileGrp>
<mets:fileGrp USE="OCR-D-GT-PAGE">
<mets:file ID="PAGE_0017_PAGE" MIMETYPE="application/vnd.prima.page+xml">
<mets:FLocat LOCTYPE="URL" xlink:href="OCR-D-GT-PAGE/PAGE_0017_PAGE.xml"/>
<mets:FLocat LOCTYPE="OTHER" OTHERLOCTYPE="FILE" xlink:href="OCR-D-GT-PAGE/PAGE_0017_PAGE.xml"/>
</mets:file>
</mets:fileGrp>
<mets:fileGrp USE="OCR-D-GT-ALTO">
<mets:file ID="PAGE_0017_ALTO" MIMETYPE="application/alto+xml">
<mets:FLocat LOCTYPE="URL" xlink:href="OCR-D-GT-ALTO/PAGE_0017_ALTO.xml"/>
<mets:FLocat LOCTYPE="OTHER" OTHERLOCTYPE="FILE" xlink:href="OCR-D-GT-ALTO/PAGE_0017_ALTO.xml"/>
</mets:file>
<mets:file ID="PAGE_0020_ALTO" MIMETYPE="application/alto+xml">
<mets:FLocat LOCTYPE="URL" xlink:href="OCR-D-GT-ALTO/PAGE_0020_ALTO.xml"/>
<mets:FLocat LOCTYPE="OTHER" OTHERLOCTYPE="FILE" xlink:href="OCR-D-GT-ALTO/PAGE_0020_ALTO.xml"/>
</mets:file>
</mets:fileGrp>
</mets:fileSec>
Expand Down
6 changes: 6 additions & 0 deletions tests/model/test_document.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,12 @@ def test_save(self):
for page_id in doc.page_ids:
for fg in doc.file_groups:
original_file = doc.files_for_page_id(page_id, fg.group, fg.mime)[0]
# workaround for core#1149: remove .url absolute path from cloning
original_file.url = None
# workaround for core#1226: remove URL FLocat directly
flocat = original_file._el.find('{http://www.loc.gov/METS/}FLocat[@LOCTYPE="URL"]')
if flocat is not None:
original_file._el.remove(flocat)
saved_file = saved.files_for_page_id(page_id, fg.group, fg.mime)[0]
self.assertEqual(original_file, saved_file)

Expand Down
2 changes: 1 addition & 1 deletion tests/util/test_launcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def test_launch_missing(self):
'Tool "missingtool" not found in your config, to fix place the following section in your ocrd-browser.conf',
log_watch.records[0].getMessage()
)
setOverrideLogLevel('OFF', True)
setOverrideLogLevel('CRITICAL', True)

def test_launch_tool(self):
with self.launcher.launch_tool(self.launcher.tools['echo'], self.doc, self.page_file, 'echo', stdout=subprocess.PIPE) as process:
Expand Down
Loading