update 2023-12-15

OCR-D · Dec 15, 2023 · 6801d66 · 6801d66
1 parent 1126724
commit 6801d66
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## Unreleased
+
+## [v2023-12-15](https://github.com/OCR-D/ocrd_all/releases/v2023-12-15)
+
+### [core](https://github.com/OCR-D/core) [742906e](https://github.com/OCR-D/core/commits/742906e)..[4684d48](https://github.com/OCR-D/core/commits/4684d48)
+
+> Release: [v2.60.0](https://github.com/OCR-D/core/releases/v2.60.0)
+
+  > * :memo: changelog
+  > * Merge branch 'git-versioning'
+  > * :memo: changelog
+  > * defaults for mets_basename and mets_server_url
+  > * Merge branch 'master' of https://github.com/OCR-D/core
+  > * :memo: changelog
+  > * ocrd workpace list-page: ignore files without pageId, fix #1148
+
 ## [v2023-12-07](https://github.com/OCR-D/ocrd_all/releases/v2023-12-07)
 
 ### [core](https://github.com/OCR-D/core) [d8c5813](https://github.com/OCR-D/core/commits/d8c5813)..[742906e](https://github.com/OCR-D/core/commits/742906e)
@@ -209,8 +225,6 @@
   > * ocrd-page-transform: support --mets-server-url
 
 
-## Unreleased
-
 ## [v2023-10-18](https://github.com/OCR-D/ocrd_all/releases/v2023-10-18)
 
 ### [core](https://github.com/OCR-D/core) [3b0307a](https://github.com/OCR-D/core/commits/3b0307a)..[caa7ac3](https://github.com/OCR-D/core/commits/caa7ac3)

diff --git a/core b/core
+2 −0		.circleci/config.yml
+9 −0		CHANGELOG.md
+18 −12		Makefile
+2 −1		ocrd/ocrd/cli/bashlib.py
+2 −2		ocrd/ocrd/cli/process.py
+2 −2		ocrd/ocrd/cli/validate.py
+3 −3		ocrd/ocrd/cli/workspace.py
+3 −3		ocrd/ocrd/cli/zip.py
+2 −1		ocrd/ocrd/decorators/ocrd_cli_options.py
+4 −3		ocrd/ocrd/resolver.py
+2 −1		ocrd/ocrd/workspace.py
+4 −4		ocrd/ocrd/workspace_backup.py
+5 −5		ocrd/ocrd/workspace_bagger.py
+42 −0		ocrd/pyproject.toml
+5 −0		ocrd/requirements.txt
+11 −27		ocrd/setup.py
+40 −0		ocrd_modelfactory/pyproject.toml
+2 −0		ocrd_modelfactory/requirements.txt
+11 −20		ocrd_modelfactory/setup.py
+40 −0		ocrd_models/pyproject.toml
+1 −0		ocrd_models/requirements.txt
+11 −19		ocrd_models/setup.py
+3 −1		ocrd_network/ocrd_network/cli/client.py
+37 −0		ocrd_network/pyproject.toml
+3 −0		ocrd_network/requirements.txt
+11 −22		ocrd_network/setup.py
+0 −6		ocrd_utils/.keras/keras.json
+1 −0		ocrd_utils/ocrd_utils/__init__.py
+2 −0		ocrd_utils/ocrd_utils/constants.py
+40 −0		ocrd_utils/pyproject.toml
+1 −18		ocrd_utils/setup.py
+2 −2		ocrd_validators/ocrd_validators/workspace_validator.py
+40 −0		ocrd_validators/pyproject.toml
+3 −0		ocrd_validators/requirements.txt
+11 −23		ocrd_validators/setup.py