Merge pull request #46 from bertsky/docker-res

Docker: resmgr shortcut

Author: bertsky

Dockerfile

@@ -26,18 +26,18 @@ ENV PIP pip3
 # so let XDG_DATA_HOME coincide with fixed system location
 # (can still be overridden by derived stages)
 ENV XDG_DATA_HOME /usr/local/share
+# avoid the need for an extra volume for persistent resource user db
+# (i.e. XDG_CONFIG_HOME/ocrd/resources.yml)
+ENV XDG_CONFIG_HOME /usr/local/share/ocrd-resources
 
 WORKDIR /build-ocrd
-COPY setup.py .
-COPY ocrd_kraken ./ocrd_kraken
-COPY ocrd_kraken/ocrd-tool.json .
-COPY README.md .
-COPY requirements.txt .
-COPY Makefile .
+COPY . .
+# prepackage ocrd-tool.json as ocrd-all-tool.json
+RUN ocrd ocrd-tool ocrd_kraken/ocrd-tool.json dump-tools > $(dirname $(ocrd bashlib filename))/ocrd-all-tool.json
+# install everything and reduce image size
 RUN make deps-ubuntu \
     && make deps install \
     && rm -fr /build-ocrd
 
 WORKDIR /data
 VOLUME /data
-

Makefile

@@ -8,7 +8,7 @@ PYTHONIOENCODING=utf8
 
 # Docker container tag ("$(DOCKER_TAG)")
 DOCKER_TAG = 'ocrd/kraken'
-DOCKER_BASE_IMAGE = docker.io/ocrd/core-cuda-torch:v2.70.0
+DOCKER_BASE_IMAGE = docker.io/ocrd/core-cuda-torch:v3.1.0
 
 
 # BEGIN-EVAL makefile-parser --make-help Makefile
@@ -92,4 +92,4 @@ tests/assets: repo/assets
 	mkdir -p tests/assets
 	cp -a repo/assets/data/* tests/assets
 
-.PHONY: docker install install-dev deps deps-ubuntu deps-test test help
+.PHONY: docker install install-dev build deps deps-ubuntu deps-test test help

ocrd_kraken/ocrd-tool.json

@@ -1,6 +1,7 @@
 {
   "git_url": "https://github.com/OCR-D/ocrd_kraken",
   "version": "1.0.1",
+  "dockerhub": "ocrd/kraken",
   "tools": {
     "ocrd-kraken-binarize": {
       "executable": "ocrd-kraken-binarize",

pyproject.toml

@@ -0,0 +1,96 @@
+[build-system]
+requires = ["setuptools>=61.0.0", "wheel", "setuptools-ocrd"]
+
+[project]
+name = "ocrd_kraken"
+authors = [
+    {name = "Robert Sachunsky", email = "sachunsky@informatik.uni-leipzig.de"},
+    {name = "Konstantin Baierer", email = "unixprog@gmail.com"},
+]
+description = "Recognize text using Kraken OCR and the OCR-D framework"
+readme = "README.md"
+license = {text = "Apache License 2.0"}
+requires-python = ">=3.8"
+keywords = ["ocr", "ocr-d", "kraken-ocr"]
+
+dynamic = ["version", "dependencies", "optional-dependencies"]
+
+# https://pypi.org/classifiers/
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Console",
+    "Intended Audience :: Science/Research",
+    "Intended Audience :: Other Audience",
+    "License :: OSI Approved :: Apache Software License",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Topic :: Text Processing",
+]
+
+[project.scripts]
+ocrd-kraken-recognize = "ocrd_kraken.cli.recognize:cli"
+ocrd-kraken-segment = "ocrd_kraken.cli.segment:cli"
+ocrd-kraken-binarize = "ocrd_kraken.cli.binarize:cli"
+
+[project.urls]
+Homepage = "https://github.com/OCR-D/ocrd_kraken"
+Repository = "https://github.com/OCR-D/ocrd_kraken.git"
+
+
+[tool.setuptools.dynamic]
+dependencies = {file = ["requirements.txt"]}
+#optional-dependencies.dev = {file = ["requirements_dev.txt"]}
+optional-dependencies.test = {file = ["requirements_test.txt"]}
+
+[tool.setuptools]
+packages = ["ocrd_kraken", "ocrd_kraken.cli"]
+package-data = {"*" = ["ocrd-tool.json"]}
+
+[tool.pytest.ini_options]
+minversion = 6.0
+addopts = "--strict-markers"
+markers = [
+    "integration: integration tests",
+]
+
+
+[tool.mypy]
+plugins = ["numpy.typing.mypy_plugin"]
+
+ignore_missing_imports = true
+
+
+strict = true
+
+disallow_subclassing_any = false
+# ❗ error: Class cannot subclass "Processor" (has type "Any")
+disallow_any_generics = false
+disallow_untyped_defs = false
+disallow_untyped_calls = false
+
+
+[tool.ruff.lint]
+select = ["E", "F", "I"]
+
+
+[tool.coverage.run]
+branch = true
+source = [
+    "ocrd_kraken"
+]
+concurrency = [
+    "thread",
+    "multiprocessing"
+]
+
+[tool.coverage.report]
+exclude_also = [
+    "if self\\.debug",
+    "pragma: no cover",
+    "raise NotImplementedError",
+    "if __name__ == .__main__.:",
+]
+ignore_errors = true
+omit = [
+    "ocrd_kraken/cli"
+]