Merge branch 'main' into pr-8-feedback

.github/workflows/ci.yml

@@ -0,0 +1,43 @@
+# Simple CI test for ocrd_froc.
+
+name: CI tests
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version:
+          - '3.8'
+          - '3.9'
+          - '3.10'
+          - '3.11'
+        os:
+          - ubuntu-22.04
+          # - macos-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install and test
+        run: |
+          # Install and test.
+          set -x
+          python3 -m venv venv
+          source venv/bin/activate
+          pip install -U pip setuptools wheel
+          pip install -r requirements.txt
+          pip install .
+          ocrd-froc-recognize --help

CHANGELOG.md

@@ -5,9 +5,29 @@ Versioned according to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+Fixed:
+
+  * Require OCR-D/core v2.64.1+ with proper support for `importlib{.,_}metadata`, #10
+  * CI: Use most recent actions, #15
+  * missing top-level `__init__.py`, #12
+
+## [0.5.2] - 2024-02-01
+
+Fixed:
+
+  - typo in ocrd-tool.json: `ocrd-froc` -> `ocrd-froc-recognize`, again
+
+## [0.5.1] - 2024-02-01
+
+Fixed:
+
+  - typo in ocrd-tool.json: `ocrd-froc` -> `ocrd-froc-recognize`
+
 ## [0.5.0] - 2024-01-30
 
 - First release in ocrd_all
 
 <!-- link-labels -->
-[0.5.0]: ../../compare/HEAD...v0.5.0
+[0.5.1]: ../../compare/v0.5.2...v0.5.1
+[0.5.1]: ../../compare/v0.5.1...v0.5.0
+[0.5.0]: ../../compare/v0.5.0...HEAD

ocrd_froc/ocrd-tool.json

@@ -1,8 +1,8 @@
 {
-  "version": "0.5.0",
+  "version": "0.5.2",
   "git_url": "https://github.com/OCR-D/ocrd_froc",
   "tools": {
-    "ocrd-froc": {
+    "ocrd-froc-recognize": {
       "executable": "ocrd-froc",
       "description": "Recognise font family/shape (annotating TextStyle) along with text (annotating TextEquiv)",
       "categories": [

ocrd_froc/processor.py

@@ -22,12 +22,12 @@
 from ocrd_modelfactory import page_from_file
 from .froc import Froc
 
-OCRD_TOOL = loads(resource_string(__name__, 'ocrd-tool.json'))
+OCRD_TOOL = loads(resource_string(__package__, 'ocrd-tool.json'))
 
 class FROCProcessor(Processor):
 
     def __init__(self, *args, **kwargs):
-        kwargs['ocrd_tool'] = OCRD_TOOL['tools']['ocrd-froc']
+        kwargs['ocrd_tool'] = OCRD_TOOL['tools']['ocrd-froc-recognize']
         kwargs['version'] = OCRD_TOOL['version']
         super().__init__(*args, **kwargs)
         if hasattr(self, 'output_file_grp'):

requirements.txt

@@ -1,4 +1,4 @@
-ocrd >= 2.22.3
+ocrd >= 2.64.1
 pandas
 scikit-image
 torch >= 1.4.0