Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🚧 Remove workaround for #91 and use upstream fix #104

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
41 changes: 0 additions & 41 deletions ocrd_calamari/fix_calamari1_model.py

This file was deleted.

3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -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@6b1412b997b6830935e28a0234071352e09a08c2
setuptools >= 41.0.0 # tensorboard depends on this, but why do we get an error at runtime?
click
ocrd >= 2.54.0
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
},
)