From afda029fbb64124b52cf33e38e7c35eeae74e6f4 Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Thu, 1 Feb 2024 14:12:46 +0100 Subject: [PATCH 01/18] typo: ocrd-froc{,-recognize} --- ocrd_froc/ocrd-tool.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocrd_froc/ocrd-tool.json b/ocrd_froc/ocrd-tool.json index 08d30de..902245a 100644 --- a/ocrd_froc/ocrd-tool.json +++ b/ocrd_froc/ocrd-tool.json @@ -2,7 +2,7 @@ "version": "0.5.0", "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": [ From 9738acb5fb579a217812ba560b3867399997ab2b Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Thu, 1 Feb 2024 14:13:25 +0100 Subject: [PATCH 02/18] :memo: changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ca9acb..b97b6ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ Versioned according to [Semantic Versioning](http://semver.org/). ## Unreleased +Fixed: + + - typo in ocrd-tool.json: `ocrd-froc` -> `ocrd-froc-recognize` + ## [0.5.0] - 2024-01-30 - First release in ocrd_all From fd015712ecad5cc6aafc4e237d22f8195c8be1f3 Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Thu, 1 Feb 2024 14:14:45 +0100 Subject: [PATCH 03/18] :package: v0.5.1 --- CHANGELOG.md | 5 ++++- ocrd_froc/ocrd-tool.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b97b6ba..5f6c075 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ Versioned according to [Semantic Versioning](http://semver.org/). ## Unreleased +## [0.5.1] - 2024-02-01 + Fixed: - typo in ocrd-tool.json: `ocrd-froc` -> `ocrd-froc-recognize` @@ -14,4 +16,5 @@ Fixed: - First release in ocrd_all -[0.5.0]: ../../compare/HEAD...v0.5.0 +[0.5.0]: ../../compare/v0.5.1...v0.5.0 +[0.5.0]: ../../compare/v0.5.0...HEAD diff --git a/ocrd_froc/ocrd-tool.json b/ocrd_froc/ocrd-tool.json index 902245a..214da03 100644 --- a/ocrd_froc/ocrd-tool.json +++ b/ocrd_froc/ocrd-tool.json @@ -1,5 +1,5 @@ { - "version": "0.5.0", + "version": "0.5.1", "git_url": "https://github.com/OCR-D/ocrd_froc", "tools": { "ocrd-froc-recognize": { From 845c12ebd804c7e0359cdc2b94edda4de3c33954 Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Thu, 1 Feb 2024 14:57:30 +0100 Subject: [PATCH 04/18] typo: ocrd-froc{,-recognize} again :/ --- ocrd_froc/processor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocrd_froc/processor.py b/ocrd_froc/processor.py index 8b15240..ddcdb87 100644 --- a/ocrd_froc/processor.py +++ b/ocrd_froc/processor.py @@ -26,7 +26,7 @@ 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'): From 544eb256a51ec59baaa0ba447cc79341f75aa483 Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Thu, 1 Feb 2024 14:58:35 +0100 Subject: [PATCH 05/18] :memo: changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f6c075..b538344 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ Versioned according to [Semantic Versioning](http://semver.org/). ## Unreleased +Fixed: + + - typo in ocrd-tool.json: `ocrd-froc` -> `ocrd-froc-recognize` + ## [0.5.1] - 2024-02-01 Fixed: From 45d5dcdefe156becb74c100faa7f722966936d3a Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Thu, 1 Feb 2024 14:59:49 +0100 Subject: [PATCH 06/18] :package: v0.5.2 --- CHANGELOG.md | 7 +++++-- ocrd_froc/ocrd-tool.json | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b538344..2eb72de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,9 +5,11 @@ Versioned according to [Semantic Versioning](http://semver.org/). ## Unreleased +## [0.5.2] - 2024-02-01 + Fixed: - - typo in ocrd-tool.json: `ocrd-froc` -> `ocrd-froc-recognize` + - typo in ocrd-tool.json: `ocrd-froc` -> `ocrd-froc-recognize`, again ## [0.5.1] - 2024-02-01 @@ -20,5 +22,6 @@ Fixed: - First release in ocrd_all -[0.5.0]: ../../compare/v0.5.1...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 diff --git a/ocrd_froc/ocrd-tool.json b/ocrd_froc/ocrd-tool.json index 214da03..ff4ac42 100644 --- a/ocrd_froc/ocrd-tool.json +++ b/ocrd_froc/ocrd-tool.json @@ -1,5 +1,5 @@ { - "version": "0.5.1", + "version": "0.5.2", "git_url": "https://github.com/OCR-D/ocrd_froc", "tools": { "ocrd-froc-recognize": { From 63fc56da6df76463566e4b5fae7f813dcf04a70d Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Thu, 11 Apr 2024 14:42:14 +0200 Subject: [PATCH 07/18] add missing top-level __init__.py, #10 --- ocrd_froc/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 ocrd_froc/__init__.py diff --git a/ocrd_froc/__init__.py b/ocrd_froc/__init__.py new file mode 100644 index 0000000..e69de29 From 3fab28a01450050ec2247c0d94c3dba485b3e60b Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sun, 14 Apr 2024 08:57:18 +0200 Subject: [PATCH 08/18] Add GitHub action for CI Signed-off-by: Stefan Weil --- .github/workflows/ci.yml | 44 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..c47dc4d --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,44 @@ +# 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.7' + # - '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@v4 + 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 From 0dca961ec411c47a7e97b3d88cf64622f468f4cf Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sun, 14 Apr 2024 10:16:50 +0200 Subject: [PATCH 09/18] Update GutHub action for CI (add argument --help, test Python 3.8) Signed-off-by: Stefan Weil --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c47dc4d..ffe49e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: matrix: python-version: # - '3.7' - # - '3.8' + - '3.8' - '3.9' # - '3.10' # - '3.11' @@ -41,4 +41,4 @@ jobs: pip install -U pip setuptools wheel pip install -r requirements.txt pip install . - ocrd-froc-recognize + ocrd-froc-recognize --help From 0d756b420d4df976ad309eae8df281d131c784e0 Mon Sep 17 00:00:00 2001 From: kba Date: Mon, 15 Apr 2024 17:18:04 +0200 Subject: [PATCH 10/18] __name__ should be __package__, #10 --- ocrd_froc/processor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocrd_froc/processor.py b/ocrd_froc/processor.py index ddcdb87..6d69d5e 100644 --- a/ocrd_froc/processor.py +++ b/ocrd_froc/processor.py @@ -21,7 +21,7 @@ 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): From f9b0a15f79568c0baa43e08d973db98ccbd5965c Mon Sep 17 00:00:00 2001 From: kba Date: Mon, 15 Apr 2024 17:20:31 +0200 Subject: [PATCH 11/18] ci: enable all versions --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ffe49e9..f260fef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,11 +17,11 @@ jobs: fail-fast: false matrix: python-version: - # - '3.7' + - '3.7' - '3.8' - '3.9' - # - '3.10' - # - '3.11' + - '3.10' + - '3.11' os: - ubuntu-22.04 # - macos-latest From 742ec9ca13a4ad231f801e48f0e5b36056e58730 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Mon, 15 Apr 2024 17:35:39 +0200 Subject: [PATCH 12/18] Update version of GitHub actions/setup-python from v4 to v5 Signed-off-by: Stefan Weil --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ffe49e9..cbab943 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install and test From a0f3bdf1261e59d1a44cc16bb902c9173e9f2b90 Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Tue, 16 Apr 2024 12:32:21 +0200 Subject: [PATCH 13/18] Update .github/workflows/ci.yml Co-authored-by: Stefan Weil --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f260fef..95181b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,6 @@ jobs: fail-fast: false matrix: python-version: - - '3.7' - '3.8' - '3.9' - '3.10' From 7eac82f82fe4c4ce9a38d6e62b8f477e8a266ffa Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Mon, 22 Apr 2024 14:15:38 +0200 Subject: [PATCH 14/18] require core >= 2.64 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a7cb421..b07c9e6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -ocrd >= 2.22.3 +ocrd >= 2.64.0 pandas scikit-image torch >= 1.4.0 From f2d24fb706be12d630a6e11fb6a9f8a60d9ee53a Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Mon, 22 Apr 2024 14:39:25 +0200 Subject: [PATCH 15/18] require core >= 2.64.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b07c9e6..0e8ac31 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -ocrd >= 2.64.0 +ocrd >= 2.64.1 pandas scikit-image torch >= 1.4.0 From 433c9adf7bb6e19aa9b2345a384af008ba8c14a3 Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Mon, 22 Apr 2024 14:47:40 +0200 Subject: [PATCH 16/18] :memo: changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2eb72de..0be3320 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ Versioned according to [Semantic Versioning](http://semver.org/). ## Unreleased +Fixed: + + * Require OCR-D/core v2.64.1+ with proper support for `importlib{.,_}metadata`, #10 + ## [0.5.2] - 2024-02-01 Fixed: From d0f82658271633d98ba84b2b497d123bcd1ef47a Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Mon, 22 Apr 2024 14:48:24 +0200 Subject: [PATCH 17/18] :memo: changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0be3320..194b4d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ Versioned according to [Semantic Versioning](http://semver.org/). Fixed: * Require OCR-D/core v2.64.1+ with proper support for `importlib{.,_}metadata`, #10 + * CI: Use most recent actions, #15 ## [0.5.2] - 2024-02-01 From 2433c57b80c7a155d34b8545a122e9fa3b9430cd Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Mon, 22 Apr 2024 14:49:43 +0200 Subject: [PATCH 18/18] :memo: changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 194b4d9..2bac978 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ 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