Merge pull request #5 from MehmedGIT/port-to-v3

Port to ocrd core version 3.0.0

Author: bertsky

.github/workflows/test.yml

@@ -0,0 +1,33 @@
+name: Test ocrd_cis installation and run tests
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
+        os: [ "ubuntu-22.04" ]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '11'
+      - name: Install ocrd_cis
+        run: make install
+      - name: Test ocrd_cis
+        run: make test V=

Makefile

@@ -3,6 +3,7 @@ PIP ?= pip3
 V ?= > /dev/null 2>&1
 PKG = ocrd_cis
 TAG = flobar/ocrd_cis
+SHELL = bash
 
 install:
 	${PIP} install --upgrade pip .
@@ -20,9 +21,26 @@ docker-push: docker-build
 	docker push $(TAG):latest
 
 TEST_SCRIPTS=$(sort $(filter-out tests/run_training_test.bash, $(wildcard tests/run_*.bash)))
+INDENT != MAX=; for NAME in $(TEST_SCRIPTS:tests/%=%); do if test $${\#MAX} -lt $${\#NAME}; then MAX=$${NAME//?/_}; fi; done; echo $$MAX
+indent = `WHAT=$1; WITH=$(INDENT); echo $$WHAT$${WITH:$${\#WHAT}}`
+format_tr = "$(call indent,$1):\t%U\t%S\t%E\t%P\t(%Mk)"
+format_th = "$(call indent)\tuser\tsystem\telapsed\tCPU\tmaxRSS"
+
 .PHONY: $(TEST_SCRIPTS)
 $(TEST_SCRIPTS):
-	bash $@ $V
+	OCRD_MAX_PARALLEL_PAGES=1 /usr/bin/time -o test_serially.log -a -f $(call format_tr,$(@F)) bash -x $@ $V
+	OCRD_MAX_PARALLEL_PAGES=4 /usr/bin/time -o test_parallel.log -a -f $(call format_tr,$(@F)) bash -x $@ $V
+
+test: export OCRD_OVERRIDE_LOGLEVEL=DEBUG
+test: export OCRD_MISSING_OUTPUT=ABORT
+test: export OCRD_MAX_MISSING_OUTPUTS=-1
 test: $(TEST_SCRIPTS)
-	@echo $^
+	@echo =====single-processing test results=====
+	@echo -e $(call format_th)
+	@cat test_serially.log
+	@echo =====4-page-parallel test results=====
+	@echo -e $(call format_th)
+	@cat test_parallel.log
+	@$(RM) test_serially.log test_parallel.log
+
 .PHONY: install install-devel uninstall test docker-build docker-push

ocrd_cis/__init__.py

@@ -1,3 +1,2 @@
 from .javaprocess import JavaAligner
 from .javaprocess import JavaPostCorrector
-from .ocrd_tool import get_ocrd_tool