🚧 Remove workaround for #91 and use upstream fix

OCR-D · Oct 25, 2023 · 4c810ed · 4c810ed
1 parent 6a158f0
commit 4c810ed
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 45 deletions.
diff --git a/Makefile b/Makefile
@@ -40,8 +40,6 @@ install:
 
 $(MODEL):
 	ocrd resmgr download ocrd-calamari-recognize $@
-	# Workaround, see #91 https://github.com/OCR-D/ocrd_calamari/issues/91
-	fix-calamari1-model ~/.local/share/ocrd-resources/ocrd-calamari-recognize/$@
 
 # Download example data (for the README)
 example: $(EXAMPLE)

diff --git a/ocrd_calamari/fix_calamari1_model.py b/ocrd_calamari/fix_calamari1_model.py
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,7 @@
 tensorflow >= 2.5.0
 numpy
-calamari-ocr == 1.0.*, >= 1.0.6
+#calamari-ocr == 1.0.*, >= 1.0.6
+calamari-ocr @ git+https://github.com/Calamari-OCR/calamari.git@9c8fb004d4f57b8fa51b82aa499e753589e007fd
 setuptools >= 41.0.0  # tensorboard depends on this, but why do we get an error at runtime?
 click
 ocrd >= 2.54.0
diff --git a/setup.py b/setup.py
@@ -25,7 +25,6 @@
     entry_points={
         "console_scripts": [
             "ocrd-calamari-recognize=ocrd_calamari.cli:ocrd_calamari_recognize",
-            "fix-calamari1-model=ocrd_calamari.fix_calamari1_model:fix_calamari1_model",
         ]
     },
 )