merge master

Author: kba

CHANGELOG.md

@@ -5,6 +5,17 @@ Versioned according to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+## [2.63.3] - 2024-03-07
+
+Added:
+
+  * `make uninstall-workaround` compantion to `make install-workaround`, #119
+
+Fixed:
+
+  * `OcrdMets.add_file`: fix finding existing el_pagediv, #1199
+
+
 ## [2.63.2] - 2024-03-05
 
 Fixed:
@@ -2027,6 +2038,10 @@ Fixed
 Initial Release
 
 <!-- link-labels -->
+<<<<<<< HEAD
+=======
+[2.63.3]: ../../compare/v2.63.3..v2.63.1
+>>>>>>> master
 [2.63.2]: ../../compare/v2.63.2..v2.63.1
 [2.63.1]: ../../compare/v2.63.1..v2.63.0
 [2.63.0]: ../../compare/v2.63.0..v2.62.0

Makefile

@@ -355,7 +355,7 @@ build-workaround: pyclean
 
 # test that the aliased packages work in isolation and combined
 test-workaround: build-workaround
-	for dist in $(BUILD_ORDER);do pip uninstall --yes $$dist;done
+	$(MAKE) uninstall-workaround
 	for dist in $(BUILD_ORDER);do \
 		pip install dist/$$dist-*.whl ;\
 		ocrd --version ;\
@@ -368,3 +368,7 @@ test-workaround: build-workaround
 	ocrd --version ;\
 	make test ;\
 	for dist in $(BUILD_ORDER);do pip uninstall --yes $$dist;done
+
+uninstall-workaround:
+	for dist in $(BUILD_ORDER);do $(PIP) uninstall --yes $$dist;done
+

VERSION

@@ -1 +1 @@
-2.63.2
+2.63.3

src/ocrd_models/ocrd_mets.py

@@ -763,7 +763,7 @@ def set_physical_page_for_file(self, pageId : str, ocrd_file : OcrdFile,
 
         el_pagediv = None
         if self._cache_flag:
-            if pageId in self._page_cache:
+            if pageId in self._page_cache[METS_PAGE_DIV_ATTRIBUTE.ID]:
                 el_pagediv = self._page_cache[METS_PAGE_DIV_ATTRIBUTE.ID][pageId]
         else:
             el_pagediv = el_seqdiv.find('mets:div[@ID="%s"]' % pageId, NS)