Merge pull request #175 from OCR-D/update-2020-08-21

update 2020-08-21
OCR-D · Aug 21, 2020 · 19edcd1 · 19edcd1
2 parents 75e6eb5 + 53e63fc
commit 19edcd1
Show file tree

Hide file tree

Showing 19 changed files with 201 additions and 22 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,7 +6,7 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker      # https://circleci.com/docs/2.0/building-docker-images/
-      - run: make docker-maximum
+      - run: make -j docker-maximum
   deploy:
     docker:
       - image: circleci/buildpack-deps:stretch

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,188 @@
 # Changelog
 
+## [v2020-08-21](https://github.com/OCR-D/ocrd_all/releases/v2020-08-21)
+
+### [core](https://github.com/OCR-D/core) [a07568e](https://github.com/OCR-D/core/commitsa07568e)..[dc3ffe4](https://github.com/OCR-D/core/commits/dc3ffe4)
+
+> Release: [v2.13.2](https://github.com/OCR-D/core/releases/v2.13.2)
+
+  > * :package: v2.13.2
+  > * workspace: ensure PIL.Image.open FD gets closed
+  > * :package: v2.13.1
+  > * assert_file_grp_cardinality: allow optional "msg" keyword param
+
+### [dinglehopper](https://github.com/qurator-spk/dinglehopper) [c3709e2](https://github.com/qurator-spk/dinglehopper/commitsc3709e2)..[7930ecd](https://github.com/qurator-spk/dinglehopper/commits/7930ecd)
+
+  > * 🔧 dinglehopper: Add PyCharm code style config
+
+### [ocrd_anybaseocr](https://github.com/OCR-D/ocrd_anybaseocr) [962617d](https://github.com/OCR-D/ocrd_anybaseocr/commits962617d)..[9abe7bf](https://github.com/OCR-D/ocrd_anybaseocr/commits/9abe7bf)
+
+> Release: [v1.0.0](https://github.com/OCR-D/ocrd_anybaseocr/releases/v1.0.0)
+
+  > * :package: v1.0.0
+  > * Merge pull request #66 from OCR-D/file-ids-and-such
+
+### [ocrd_calamari](https://github.com/OCR-D/ocrd_calamari) [027fcd7](https://github.com/OCR-D/ocrd_calamari/commits027fcd7)..[210c126](https://github.com/OCR-D/ocrd_calamari/commits/210c126)
+
+> Release: [v0.0.7](https://github.com/OCR-D/ocrd_calamari/releases/v0.0.7)
+
+  > * Merge pull request #42 from OCR-D/file-ids-and-such
+  > * 🗒️ README-DEV: Also release on GitHub
+  > * 📦 v0.0.7
+  > * Merge pull request #41 from OCR-D/fix/set-pcgtsid
+  > * 🚧 Tests: Add some TODOs re data + namespace version changes
+
+### [ocrd_cis](https://github.com/cisocrgroup/ocrd_cis) [fdd7345](https://github.com/cisocrgroup/ocrd_cis/commitsfdd7345)..[5bb73c3](https://github.com/cisocrgroup/ocrd_cis/commits/5bb73c3)
+
+> Release: [v0.0.10](https://github.com/cisocrgroup/ocrd_cis/releases/v0.0.10)
+
+  > * Trainining -> Training
+  > * typos
+  > * Fix lgtm alert
+  > * fix 4a1d2e39d32
+  > * set pcGtsId to METS file ID everywhere
+  > * remove old entry point for ocropy recognition
+  > * ocrolib: ensure closing FDs after mkstemp and PIL.Image.open
+  > * binarize: zoom wrt. DPI to avoid inverse edges (and gain speed) at high DPI
+  > * processors: use make_file_id and assert_file_grp_cardinality
+  > * ocropy processors: put derived images under output fileGrp…
+
+### [ocrd_keraslm](https://github.com/OCR-D/ocrd_keraslm) [be69c97](https://github.com/OCR-D/ocrd_keraslm/commitsbe69c97)..[52cb4ce](https://github.com/OCR-D/ocrd_keraslm/commits/52cb4ce)
+
+> Release: [v0.4.0](https://github.com/OCR-D/ocrd_keraslm/releases/v0.4.0)
+
+  > * :package: v0.4.0
+  > * wrapper: set pcGtsId to METS file ID
+  > * ocrd cli: use make_file_id and assert_file_grp_cardinality
+
+### [ocrd_olena](https://github.com/OCR-D/ocrd_olena) [50ecb0b](https://github.com/OCR-D/ocrd_olena/commits50ecb0b)..[54792be](https://github.com/OCR-D/ocrd_olena/commits/54792be)
+
+> Release: [v1.2.1](https://github.com/OCR-D/ocrd_olena/releases/v1.2.1)
+
+  > * :package: 1.2.1
+  > * fix handling input fileGrps where PAGE is mixed with derived images: (#68)
+
+### [ocrd_pc_segmentation](https://github.com/ocr-d-modul-2-segmentierung/ocrd-pixelclassifier-segmentation) [db0128f](https://github.com/ocr-d-modul-2-segmentierung/ocrd-pixelclassifier-segmentation/commitsdb0128f)..[5e433e3](https://github.com/ocr-d-modul-2-segmentierung/ocrd-pixelclassifier-segmentation/commits/5e433e3)
+
+> Release: [v0.1.3](https://github.com/ocr-d-modul-2-segmentierung/ocrd-pixelclassifier-segmentation/releases/v0.1.3)
+
+  > * use make_file_id and assert_file_grp_cardinality
+
+### [ocrd_repair_inconsistencies](https://github.com/qurator-spk/ocrd_repair_inconsistencies) [ba27aba](https://github.com/qurator-spk/ocrd_repair_inconsistencies/commitsba27aba)..[8182063](https://github.com/qurator-spk/ocrd_repair_inconsistencies/commits/8182063)
+
+  > * Merge pull request #10 from kba/file-ids-and-such
+
+### [ocrd_segment](https://github.com/OCR-D/ocrd_segment) [06fb5ba](https://github.com/OCR-D/ocrd_segment/commits06fb5ba)..[7596e9c](https://github.com/OCR-D/ocrd_segment/commits/7596e9c)
+
+> Release: [v0.1.0](https://github.com/OCR-D/ocrd_segment/releases/v0.1.0)
+
+  > * :package: v0.1.0
+  > * Merge remote-tracking branch 'origin/typo_conent_content'
+  > * replace_original: update docstring
+  > * extract_pages: no pageId for COCO, input_file.pageId for json
+  > * revert to old 3-output-file-grp logic in extract_pages.py
+  > * extract_regions, extract_pages: pass pageId
+  > * Use 'make_file_id' and 'assert_file_grp_cardinality' throughout
+
+### [ocrd_tesserocr](https://github.com/OCR-D/ocrd_tesserocr) [1159fbf](https://github.com/OCR-D/ocrd_tesserocr/commits1159fbf)..[49e93b9](https://github.com/OCR-D/ocrd_tesserocr/commits/49e93b9)
+
+> Release: [v0.9.1](https://github.com/OCR-D/ocrd_tesserocr/releases/v0.9.1)
+
+  > * :package: v0.9.1
+  > * changelog
+  > * Merge pull request #143 from OCR-D/fix-142
+  > * pip install -U pip before pip install (#138)
+  > * Merge pull request #132 from bertsky/crop-relative
+  > * :package: v0.9.0
+  > * Merge pull request #133 from bertsky/alternativeimage-same-filegrp
+
+### [ocrd_typegroups_classifier](https://github.com/OCR-D/ocrd_typegroups_classifier) [94a3630](https://github.com/OCR-D/ocrd_typegroups_classifier/commits94a3630)..[3dddd94](https://github.com/OCR-D/ocrd_typegroups_classifier/commits/3dddd94)
+
+> Release: [v0.1.1](https://github.com/OCR-D/ocrd_typegroups_classifier/releases/v0.1.1)
+
+  > * :package: v0.1.0
+  > * use make_file_id/assert_file_grp_cardinality
+  > * fix test
+  > * heatmap.py --help: grad_cam -> heatmap
+  > * Merge remote-tracking branch 'seuretm/master' into HEAD
+
+### [ocrd_wrap](https://github.com/bertsky/ocrd_wrap) [2cfffed](https://github.com/bertsky/ocrd_wrap/commits2cfffed)..[6d92c02](https://github.com/bertsky/ocrd_wrap/commits/6d92c02)
+
+> Release: [v0.1.0](https://github.com/bertsky/ocrd_wrap/releases/v0.1.0)
+
+  > * ocrd-preprocess-image: avoid passing commas from parameter value to image file IDs
+  > * fix spaces in makefile (ht @kba)
+  > * set pcGtsId to METS file ID everywhere
+  > * put derived images under output fileGrp…
+  > * ensure mkstemp fd gets closed afterwards
+  > * ensure PIL.Image gets closed afterwards
+
+### [opencv-python](https://github.com/skvark/opencv-python) [83acfc9](https://github.com/skvark/opencv-python/commits83acfc9)..[e4893f2](https://github.com/skvark/opencv-python/commits/e4893f2)
+
+> Release: [42](https://github.com/skvark/opencv-python/releases/42)
+
+  > * update README [skip ci]
+  > * add ccache and cmake to aarch64 Dockerfile (requires rebuild)
+  > * aarch64 needs to be rebuilt with cmake
+  > * test aarch64 build
+  > * drop Python 3.5 support
+  > * use switch instead
+  > * force qt uninstall
+  > * unlink and reinstall
+  > * just use the raw url directly
+  > * no auto update, use extract
+  > * direct link
+  > * 5.13.2
+  > * force Qt 5.13
+  > * add aarch64 Dockerfile
+  > * another typo
+  > * fix typo in version
+  > * Add note about manylinux2014
+  > * OpenCV 4.4.0
+  > * add minimum supported Python version
+  > * fix the travis USER issue
+  > * fix twine upload command
+  > * fix sdist upload
+  > * fix min numpy version for 3.6
+  > * reduce verbosity
+  > * patch only on linux
+  > * fix windows builds
+  > * update licenses
+  > * update license info
+  > * wrong dir
+  > * update patch
+  > * update patch
+  > * update patch
+  > * copy fonts
+  > * set QT_QPA_FONTDIR
+  > * add fonts to the package
+  > * azure-cli should work now
+  > * use py27 compatible version
+  > * use pip
+  > * Install azure-cli from Ubuntu repo because latest update broke batch upload
+  > * fix patch location
+  > * auditwheel is installed under py37
+  > * try to whitelist libxcb.so.1
+  > * fix patch
+  > * change path
+  > * qt5.15 again
+  > * fix typo, try without xcb helpers
+  > * add ld lib path
+  > * qt 5.13 test
+
+### [sbb_textline_detector](https://github.com/qurator-spk/sbb_textline_detector) [eba5f54](https://github.com/qurator-spk/sbb_textline_detector/commitseba5f54)..[a7c92c9](https://github.com/qurator-spk/sbb_textline_detector/commits/a7c92c9)
+
+  > * Merge pull request #38 from qurator-spk/printspace-vs-border
+  > * Merge pull request #37 from qurator-spk/update-readme
+  > * add travis CI badge
+  > * Merge pull request #13 from stweil/travis
+  > * Merge pull request #36 from kba/file-ids-and-such
+  > * 🐛 sbb_textline_detection: Set pcGtsId
+
+### [workflow-configuration](https://github.com/bertsky/workflow-configuration) [7edcb90](https://github.com/bertsky/workflow-configuration/commits7edcb90)..[7c89037](https://github.com/bertsky/workflow-configuration/commits/7c89037)
+
+  > * avoid citation notice for GNU parallel
+
 ## [v2020-08-04](https://github.com/OCR-D/ocrd_all/releases/v2020-08-04)
 
 ### [core](https://github.com/OCR-D/core) [320a2fd](https://github.com/OCR-D/core/commits320a2fd)..[a07568e](https://github.com/OCR-D/core/commits/a07568e)
@@ -22,7 +205,6 @@
   > * circleci: patch pix2pixhd and install pytest
   > * circleci: fix setup and badge
   > * Merge remote-tracking branch 'origin/master' into fix-installation
-  > * Merge branch 'fix-installation' of https://github.com/OCR-D/ocrd_anybaseocr into fix-installation
   > * remove "force" parameter
   > * dewarp: use assert_file_grp_cardinality
   > * document prepare_options hack in dewarp
@@ -40,10 +222,8 @@
   > * Update Makefile
   > * prepare_data is a function, not a method
   > * prepare_data is a function, not a method
-  > * Merge branch 'fix-installation' of https://github.com/mjenckel/ocrd_anybaseocr into fix-installation
   > * make assets: copy models as before
   > * :memo: update CLI test comments
-  > * Merge branch 'fix-installation' of https://github.com/mjenckel/ocrd_anybaseocr into fix-installation
   > * MANIFEST.in: drop "graft pix2pixHD"
   > * :memo: update install instructions
   > * dewarp: modify prepare_options so they are actually picked up ...
@@ -74,7 +254,6 @@
 
   > * Merge pull request #66 from mikegerber/fix/travis-install
   > * :package: v1.2.0
-  > * Merge branch 'default-impl'
   > * make install: more robust check whether ocrd CLI installed, fix #61
 
 ### [opencv-python](https://github.com/skvark/opencv-python) [914404d](https://github.com/skvark/opencv-python/commits914404d)..[83acfc9](https://github.com/skvark/opencv-python/commits/83acfc9)

diff --git a/core b/core
diff --git a/dinglehopper b/dinglehopper
diff --git a/ocrd_anybaseocr b/ocrd_anybaseocr
diff --git a/ocrd_calamari b/ocrd_calamari
diff --git a/ocrd_cis b/ocrd_cis
diff --git a/ocrd_keraslm b/ocrd_keraslm
diff --git a/ocrd_olena b/ocrd_olena
diff --git a/ocrd_pc_segmentation b/ocrd_pc_segmentation
diff --git a/ocrd_repair_inconsistencies b/ocrd_repair_inconsistencies
diff --git a/ocrd_segment b/ocrd_segment
diff --git a/ocrd_tesserocr b/ocrd_tesserocr
diff --git a/ocrd_typegroups_classifier b/ocrd_typegroups_classifier
diff --git a/ocrd_wrap b/ocrd_wrap
diff --git a/opencv-python b/opencv-python
diff --git a/release.sh b/release.sh
@@ -103,7 +103,7 @@ submodule_changelog () {
         smtag="\\n> Release: [$smtag]($smurl/releases/$smtag)\\n"
     fi
     loginfo "Generating changelog for $sm"
-    git diff --submodule=log "$previous_version".. "$sm" | sed \
+    git diff --submodule=log "$sm" | sed \
         -e "s,^Submodule \\([^ ]\\+\\) \\([^\.]\\+\\)..\\([^\.]\\+\\):,### [\1]($smurl) [\2]($smurl/commits\2)..[\3]($smurl/commits/\3)\\n$smtag," \
         -e 's,^\s*>,  > *,'
 }

diff --git a/sbb_textline_detector b/sbb_textline_detector
diff --git a/workflow-configuration b/workflow-configuration
+14 −0		CHANGELOG.md
+1 −0		Makefile
+1 −0		ocrd/ocrd/workspace.py
+8 −3		ocrd_utils/ocrd_utils/str.py
+1 −1		ocrd_utils/setup.py
+2 −0		tests/test_utils.py
+5 −0		.idea/codeStyles/codeStyleConfig.xml
+5 −8		qurator/dinglehopper/ocrd_cli.py
+1 −1		requirements.txt
+1 −1		.circleci/config.yml
+1 −0		.gitignore
+10 −1		CHANGELOG.md
+12 −9		Makefile
+15 −20		ocrd_anybaseocr/cli/ocrd_anybaseocr_binarize.py
+13 −23		ocrd_anybaseocr/cli/ocrd_anybaseocr_block_segmentation.py
+14 −25		ocrd_anybaseocr/cli/ocrd_anybaseocr_cropping.py
+19 −23		ocrd_anybaseocr/cli/ocrd_anybaseocr_deskew.py
+14 −13		ocrd_anybaseocr/cli/ocrd_anybaseocr_dewarp.py
+3 −1		ocrd_anybaseocr/cli/ocrd_anybaseocr_layout_analysis.py
+13 −25		ocrd_anybaseocr/cli/ocrd_anybaseocr_textline.py
+12 −23		ocrd_anybaseocr/cli/ocrd_anybaseocr_tiseg.py
+1 −1		ocrd_anybaseocr/ocrd-tool.json
+36 −0		tests/test_crop.py
+21 −8		tests/test_dewarp.py
+1 −0		README-DEV.md
+1 −1		ocrd_calamari/ocrd-tool.json
+6 −7		ocrd_calamari/recognize.py
+1 −1		requirements.txt
+1 −1		setup.py
+2 −0		test/test_recognize.py
+7 −7		README.md
+7 −7		ocrd_cis/align/cli.py
+17 −11		ocrd_cis/ocrd-tool.json
+48 −39		ocrd_cis/ocropy/binarize.py
+1 −9		ocrd_cis/ocropy/cli.py
+14 −23		ocrd_cis/ocropy/clip.py
+3 −1		ocrd_cis/ocropy/common.py
+14 −23		ocrd_cis/ocropy/denoise.py
+15 −23		ocrd_cis/ocropy/deskew.py
+17 −22		ocrd_cis/ocropy/dewarp.py
+8 −8		ocrd_cis/ocropy/ocrolib/common.py
+0 −108		ocrd_cis/ocropy/rec.py
+10 −7		ocrd_cis/ocropy/recognize.py
+14 −23		ocrd_cis/ocropy/resegment.py
+9 −14		ocrd_cis/ocropy/segment.py
+1 −2		setup.py
+3 −0		.gitignore
+16 −0		CHANGELOG.md
+1 −1		ocrd_keraslm/wrapper/ocrd-tool.json
+17 −18		ocrd_keraslm/wrapper/rate.py
+1 −2		requirements.txt
+4 −1		setup.py
+8 −0		CHANGELOG.md
+2 −2		Makefile
+25 −3		ocrd-olena-binarize
+1 −1		ocrd-tool.json
+25 −0		CHANGELOG.md
+4 −1		ocrd_segment/evaluate.py
+8 −8		ocrd_segment/extract_lines.py
+8 −4		ocrd_segment/extract_pages.py
+8 −5		ocrd_segment/extract_regions.py
+8 −15		ocrd_segment/import_coco_segmentation.py
+7 −9		ocrd_segment/import_image_segmentation.py
+1 −1		ocrd_segment/ocrd-tool.json
+7 −6		ocrd_segment/repair.py
+12 −18		ocrd_segment/replace_original.py
+1 −1		requirements.txt
+25 −0		CHANGELOG.md
+133 −14		README.md
+320 −0		heatmap.py
+ −		ocrd_typegroups_classifier/models/densenet121.tgc
+1 −1		ocrd_typegroups_classifier/ocrd-tool.json
+9 −4		ocrd_typegroups_classifier/processor.py
+5 −2		setup.py
+5 −4		tests/test.sh
+0 −116		tools/heatmap.py
+0 −194		tools/train-model.py
+10 −0		CHANGELOG.md
+2 −2		Makefile
+1 −1		ocrd_wrap/ocrd-tool.json
+28 −34		ocrd_wrap/shell.py
+19 −30		ocrd_wrap/skimage_binarize.py
+19 −30		ocrd_wrap/skimage_denoise.py
+19 −30		ocrd_wrap/skimage_denoise_raw.py
+19 −30		ocrd_wrap/skimage_normalize.py
+1 −1		requirements.txt