From eeb4de261a0e0838b1b77338a30a2858a37fb39e Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Fri, 25 Sep 2020 14:01:31 +0200 Subject: [PATCH] update-2020-09-25 --- CHANGELOG.md | 136 ++++++++++++++++++++++++++++++++++++++++++ cor-asv-ann | 2 +- cor-asv-fst | 2 +- core | 2 +- dinglehopper | 2 +- ocrd_anybaseocr | 2 +- ocrd_cis | 2 +- ocrd_fileformat | 2 +- ocrd_keraslm | 2 +- ocrd_kraken | 2 +- ocrd_pagetopdf | 2 +- ocrd_pc_segmentation | 2 +- ocrd_segment | 2 +- ocrd_tesserocr | 2 +- ocrd_wrap | 2 +- opencv-python | 2 +- release.sh | 3 + sbb_textline_detector | 2 +- 18 files changed, 155 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd96f379..70128435 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,141 @@ # Changelog +## [v2020-09-25](https://github.com/OCR-D/ocrd_all/releases/v2020-09-25) + +### [cor-asv-ann](https://github.com/ASVLeipzig/cor-asv-ann) [69bae66](https://github.com/ASVLeipzig/cor-asv-ann/commits/69bae66)..[f48b0e2](https://github.com/ASVLeipzig/cor-asv-ann/commits/f48b0e2) + +> Release: [v0.1.3](https://github.com/ASVLeipzig/cor-asv-ann/releases/v0.1.3) + + > * Merge pull request #5 from kba/getlogger + +### [cor-asv-fst](https://github.com/ASVLeipzig/cor-asv-fst) [2428cca](https://github.com/ASVLeipzig/cor-asv-fst/commits/2428cca)..[076e04e](https://github.com/ASVLeipzig/cor-asv-fst/commits/076e04e) + + > * Merge pull request #6 from kba/getlogger + +### [core](https://github.com/OCR-D/core) [d9fb6e51](https://github.com/OCR-D/core/commits/d9fb6e51)..[cb0f94bc](https://github.com/OCR-D/core/commits/cb0f94bc) + +> Release: [v2.17.0](https://github.com/OCR-D/core/releases/v2.17.0) + + > * :package: v2.17.0 + > * :memo: changelog + > * Merge branch 'make-file-id-syntax' + > * :memo: changelog + > * Merge branch 'master' into fix-logging-yet-again + > * logging disable: CRITICAL->ERROR + > * logging config_file: info->debug, after loading, specific logger + > * logging: drop "reinit" initLogging arg + > * logging: multiple initLogging should log not raise + > * logging: simplify log message if getLogger before initLogging + > * logging: disableLogging should actually call logging.disable + > * logging: builtin config: tensorflow ERROR + > * logging: if logger is called before initLogging, issue a stern notice about it + > * Merge branch 'master' into fix-logging-yet-again + > * Merge branch 'master' into fix-logging-yet-again + > * logging: fix tests + > * logging: use method-specific loggers throughout + > * logging: initLogging on non-module level for all CLI + > * logging: do not set the root logger to NOTSET, fix #597 + > * logging: handle either config file or builtin config, not both + > * logging: forbid getLogger before initLogging + > * logging: forbid multiple non-forced initLogging calls + > * [rfct] split decorators into topical modules + +### [dinglehopper](https://github.com/qurator-spk/dinglehopper) [717801b](https://github.com/qurator-spk/dinglehopper/commits/717801b)..[7085ee0](https://github.com/qurator-spk/dinglehopper/commits/7085ee0) + + > * Merge pull request #29 from kba/getlogger + > * 📝 dinglehopper: Document REPORT_PREFIX (Closes GH-27.) + > * ⚙️ dinglehopper: Add PyCharm's vcs.xml to git + +### [ocrd_anybaseocr](https://github.com/OCR-D/ocrd_anybaseocr) [85f2387](https://github.com/OCR-D/ocrd_anybaseocr/commits/85f2387)..[a0999ec](https://github.com/OCR-D/ocrd_anybaseocr/commits/a0999ec) + +> Release: [v1.0.2](https://github.com/OCR-D/ocrd_anybaseocr/releases/v1.0.2) + + > * :package: v1.0.2 + > * Merge pull request #69 from OCR-D/getlogger + +### [ocrd_cis](https://github.com/cisocrgroup/ocrd_cis) [c361dbb](https://github.com/cisocrgroup/ocrd_cis/commits/c361dbb)..[fb6cb47](https://github.com/cisocrgroup/ocrd_cis/commits/fb6cb47) + +> Release: [v0.1.3](https://github.com/cisocrgroup/ocrd_cis/releases/v0.1.3) + + > * Merge pull request #69 from kba/getlogger + +### [ocrd_fileformat](https://github.com/OCR-D/ocrd_fileformat) [f1fd61e](https://github.com/OCR-D/ocrd_fileformat/commits/f1fd61e)..[584240b](https://github.com/OCR-D/ocrd_fileformat/commits/584240b) + +> Release: [v0.1.0](https://github.com/OCR-D/ocrd_fileformat/releases/v0.1.0) + + > * respect --overwrite, fix #16 + > * :package: v0.1.0 + > * Merge pull request #19 from OCR-D/smarter-ext + > * :package: v0.0.7 + > * Merge pull request #18 from OCR-D/update-fileformat + +### [ocrd_keraslm](https://github.com/OCR-D/ocrd_keraslm) [52cb4ce](https://github.com/OCR-D/ocrd_keraslm/commits/52cb4ce)..[b11b51d](https://github.com/OCR-D/ocrd_keraslm/commits/b11b51d) + +> Release: [v0.4.1](https://github.com/OCR-D/ocrd_keraslm/releases/v0.4.1) + + > * :package: v0.4.1 + > * Update CHANGELOG.md + > * getLogger per method + +### [ocrd_kraken](https://github.com/OCR-D/ocrd_kraken) [cea90bd](https://github.com/OCR-D/ocrd_kraken/commits/cea90bd)..[0a839ad](https://github.com/OCR-D/ocrd_kraken/commits/0a839ad) + +> Release: [v0.1.2](https://github.com/OCR-D/ocrd_kraken/releases/v0.1.2) + + > * :package: v0.1.2 + > * Merge pull request #32 from OCR-D/getlogger + +### [ocrd_pagetopdf](https://github.com/UB-Mannheim/ocrd_pagetopdf) [88faa74](https://github.com/UB-Mannheim/ocrd_pagetopdf/commits/88faa74)..[58df37a](https://github.com/UB-Mannheim/ocrd_pagetopdf/commits/58df37a) + + > * respect --overwrite in multipagepdf.py + +### [ocrd_pc_segmentation](https://github.com/ocr-d-modul-2-segmentierung/ocrd-pixelclassifier-segmentation) [80ede8f](https://github.com/ocr-d-modul-2-segmentierung/ocrd-pixelclassifier-segmentation/commits/80ede8f)..[3e69bff](https://github.com/ocr-d-modul-2-segmentierung/ocrd-pixelclassifier-segmentation/commits/3e69bff) + +> Release: [v0.1.3](https://github.com/ocr-d-modul-2-segmentierung/ocrd-pixelclassifier-segmentation/releases/v0.1.3) + + > * getLogger per method + > * Bump version: 0.2.1 → 0.2.2 + > * Update setup.py to reflect requirements.txt changes + > * Migrate to ocr4all-pixel-classifier 0.5.1 + +### [ocrd_segment](https://github.com/OCR-D/ocrd_segment) [a71cbaa](https://github.com/OCR-D/ocrd_segment/commits/a71cbaa)..[aadbc7b](https://github.com/OCR-D/ocrd_segment/commits/aadbc7b) + +> Release: [v0.1.3](https://github.com/OCR-D/ocrd_segment/releases/v0.1.3) + + > * Update CHANGELOG.md + > * Merge pull request #46 from OCR-D/getlogger + +### [ocrd_tesserocr](https://github.com/OCR-D/ocrd_tesserocr) [b32ae0c](https://github.com/OCR-D/ocrd_tesserocr/commits/b32ae0c)..[27fe2be](https://github.com/OCR-D/ocrd_tesserocr/commits/27fe2be) + +> Release: [v0.9.4](https://github.com/OCR-D/ocrd_tesserocr/releases/v0.9.4) + + > * Update CHANGELOG.md + > * :package: v0.9.4 + > * getLogger per method + > * Merge pull request #154 from bertsky/fix-image-new + +### [ocrd_wrap](https://github.com/bertsky/ocrd_wrap) [6d92c02](https://github.com/bertsky/ocrd_wrap/commits/6d92c02)..[a79cd7d](https://github.com/bertsky/ocrd_wrap/commits/a79cd7d) + +> Release: [v0.1.1](https://github.com/bertsky/ocrd_wrap/releases/v0.1.1) + + > * Update CHANGELOG.md + > * :package: 0.1.1 + > * Merge pull request #5 from kba/getlogger + +### [opencv-python](https://github.com/skvark/opencv-python) [893430f](https://github.com/skvark/opencv-python/commits/893430f)..[c001042](https://github.com/skvark/opencv-python/commits/c001042) + +> Release: [44](https://github.com/skvark/opencv-python/releases/44) + + > * update openssl, no-pinshared, see #381 + > * disable nodelete, see #381 + +### [sbb_textline_detector](https://github.com/qurator-spk/sbb_textline_detector) [0f09f4a](https://github.com/qurator-spk/sbb_textline_detector/commits/0f09f4a)..[cbc9838](https://github.com/qurator-spk/sbb_textline_detector/commits/cbc9838) + + > * Merge pull request #41 from kba/getlogger + + + + + ## [v2020-09-08.1](https://github.com/OCR-D/ocrd_all/releases/v2020-09-08.1) ### [core](https://github.com/OCR-D/core) [3d4e7f2](https://github.com/OCR-D/core/commits/3d4e7f2)..[8dafbac](https://github.com/OCR-D/core/commits/938a907) diff --git a/cor-asv-ann b/cor-asv-ann index 69bae664..f48b0e21 160000 --- a/cor-asv-ann +++ b/cor-asv-ann @@ -1 +1 @@ -Subproject commit 69bae664d7f5f4821ec2c1c8f492ed55828c08eb +Subproject commit f48b0e21f93c0eb0854932dd52acc48a1e4243e1 diff --git a/cor-asv-fst b/cor-asv-fst index 2428cca3..076e04ef 160000 --- a/cor-asv-fst +++ b/cor-asv-fst @@ -1 +1 @@ -Subproject commit 2428cca3e14b6ee28a25ba96049f29981f408d5f +Subproject commit 076e04ef882bbed0b5b70e6a6a461940b82bb404 diff --git a/core b/core index d9fb6e51..cb0f94bc 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit d9fb6e51aae77fbc826a6b91c49965f7264163b9 +Subproject commit cb0f94bc7affbff44ec53ad2258d8f8f6bf996d6 diff --git a/dinglehopper b/dinglehopper index 717801bd..7085ee0f 160000 --- a/dinglehopper +++ b/dinglehopper @@ -1 +1 @@ -Subproject commit 717801bdbb15c920dd0924524950d8401a3e66c0 +Subproject commit 7085ee0fd880d8873cb9e77caaf97b6979606971 diff --git a/ocrd_anybaseocr b/ocrd_anybaseocr index 85f23877..a0999ec0 160000 --- a/ocrd_anybaseocr +++ b/ocrd_anybaseocr @@ -1 +1 @@ -Subproject commit 85f23877e6bc9b005bb40bfad7fa89b22321e7c8 +Subproject commit a0999ec02e8bd9975cab681f77fed79dcb5f00b3 diff --git a/ocrd_cis b/ocrd_cis index c361dbbc..fb6cb477 160000 --- a/ocrd_cis +++ b/ocrd_cis @@ -1 +1 @@ -Subproject commit c361dbbc8ae265e6ef222b414d74d483b1c0d20a +Subproject commit fb6cb4777b695c0df275a8142b29a9fcfce25376 diff --git a/ocrd_fileformat b/ocrd_fileformat index f1fd61e1..584240b5 160000 --- a/ocrd_fileformat +++ b/ocrd_fileformat @@ -1 +1 @@ -Subproject commit f1fd61e14267dbf1f72f15341b4f0dfc1b082481 +Subproject commit 584240b58042d8f4faf4da054b7055f03074b9dd diff --git a/ocrd_keraslm b/ocrd_keraslm index 52cb4ce3..b11b51d3 160000 --- a/ocrd_keraslm +++ b/ocrd_keraslm @@ -1 +1 @@ -Subproject commit 52cb4ce36d83886e2d2eda9ef46e395db5ecd8b8 +Subproject commit b11b51d307799bff5ad55ccc197093530d71389e diff --git a/ocrd_kraken b/ocrd_kraken index cea90bd7..0a839ad7 160000 --- a/ocrd_kraken +++ b/ocrd_kraken @@ -1 +1 @@ -Subproject commit cea90bd791384995275d6c76cea44cc247d4298e +Subproject commit 0a839ad75629b07ab51517b73fe645a6c36b23b2 diff --git a/ocrd_pagetopdf b/ocrd_pagetopdf index 88faa746..58df37a3 160000 --- a/ocrd_pagetopdf +++ b/ocrd_pagetopdf @@ -1 +1 @@ -Subproject commit 88faa746d2bbe7b7c6aad9dd626a54b8fc631b14 +Subproject commit 58df37a38dd81ca7fe499223a092d07225b554d6 diff --git a/ocrd_pc_segmentation b/ocrd_pc_segmentation index 80ede8f8..3e69bff4 160000 --- a/ocrd_pc_segmentation +++ b/ocrd_pc_segmentation @@ -1 +1 @@ -Subproject commit 80ede8f8a014d485c83bc48b6d14d72d21040f40 +Subproject commit 3e69bff4dffa373536ef5440680bb1f4f030be6f diff --git a/ocrd_segment b/ocrd_segment index a71cbaa8..aadbc7b3 160000 --- a/ocrd_segment +++ b/ocrd_segment @@ -1 +1 @@ -Subproject commit a71cbaa89ddf9683270076d7aaa99656fdae2883 +Subproject commit aadbc7b33ebceee320cd1a8b13c2392a389476a2 diff --git a/ocrd_tesserocr b/ocrd_tesserocr index b32ae0ca..27fe2be1 160000 --- a/ocrd_tesserocr +++ b/ocrd_tesserocr @@ -1 +1 @@ -Subproject commit b32ae0ca6f8dcd2d4ace33123d17a5d763ec91d9 +Subproject commit 27fe2be167040fdcbc9659d1daf263aab5e0def4 diff --git a/ocrd_wrap b/ocrd_wrap index 6d92c02e..a79cd7d4 160000 --- a/ocrd_wrap +++ b/ocrd_wrap @@ -1 +1 @@ -Subproject commit 6d92c02e968a8622b1918fc71e4469c6413a8f9b +Subproject commit a79cd7d461097320f4027869bd8b259e59e55f15 diff --git a/opencv-python b/opencv-python index 893430f3..c001042f 160000 --- a/opencv-python +++ b/opencv-python @@ -1 +1 @@ -Subproject commit 893430f3f88d9aaff6ab58e298ef66177708dde2 +Subproject commit c001042fefc533f7a68c24c249972dcb2596305b diff --git a/release.sh b/release.sh index 017b35f6..488d36a9 100755 --- a/release.sh +++ b/release.sh @@ -103,6 +103,9 @@ submodule_changelog () { smtag="\\n> Release: [$smtag]($smurl/releases/$smtag)\\n" fi loginfo "Generating changelog for $sm" + if [ -z "$(git diff --submodule=log "$sm")" ];then + return + fi 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 index 0f09f4a1..cbc9838a 160000 --- a/sbb_textline_detector +++ b/sbb_textline_detector @@ -1 +1 @@ -Subproject commit 0f09f4a1f6b5d61987a0e6f14c9a5a4623fa3b26 +Subproject commit cbc9838aec46990c58ea8dce6b59e27bebdc007e