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.

Sign up for GitHub

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

Jump to bottom

Release 2.29.0 #759

Merged
merged 18 commits into from
Dec 8, 2021
Merged

Release 2.29.0 #759

merged 18 commits into from
Dec 8, 2021

Conversation

kba
Copy link
Member

@kba kba commented Dec 7, 2021

Preparing the next release, includes:

I would also like to include #700 if we can resolve the discussion on short notice, otherwise in the next release in a few weeks.

bertsky and others added 17 commits November 12, 2021 18:32
@bertsky
make_file_id: no page_id number extraction
2d94744 
In make_file_id, if the input file's ID does not
contain the input fileGrp, then do not attempt 
to extract the numerical part of the pageId
(which might still clash); but before fallback to
purely numerical ID, additionally check if the ID
does already contain the pageId: in that case,
only append the output fileGrp to that ID.
@bertsky
make_file_id: be robust against missing pageId
f96d3fd
@bertsky
update test_make_file_id_605
db5d36b 
(no numerical pageId extraction any more)
@bertsky
cli.ocrd-tool: delegate list-resources and show-resource to processor
f03977f
@bertsky
bashlib: add --list-resources and --show-resource
41e154d
@bertsky
cli.bashlib: add input-files (delegating to Processor)
6da3db5
@bertsky
cli.bashlib.input-files: also output make_file_id for each input file
851ab5b
@bertsky
bashlib ocrd__wrap: use cli.bashlib input-files
5e5a1d8
@bertsky
📦 v2.29.0
d135c2f
@bertsky @kba
make_file_id: in pageId fallback, use grp+id instead of id+grp
cdca67e 
Co-authored-by: Konstantin Baierer <[email protected]>
@kba
Merge branch 'pr/753'
4cd0b39
@kba
ocrd_utils.make_file_id: add test for multiple numbers in ID
26d3bc5
@kba
Merge branch 'pr/744'
fe99986
@kba
📝 changelog
1ec9e6b
@kba
Update spec to 3.15.0
93b4d14
@kba
OcrdMets.add_file: Enforce mets:fileGrp/@use to be valid xsd:int, #746
f291b38
@kba
Merge branch 'restrict-fileGrp-USE' into release-2.29.0
f5591ed
@kba kba requested a review from bertsky December 7, 2021 18:51
bertsky
bertsky approved these changes Dec 7, 2021
View reviewed changes
Copy link
Collaborator

@bertsky bertsky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would also like to include #700 if we can resolve the discussion on short notice, otherwise in the next release in a few weeks.

Let's discuss tomorrow, then test some more, then release independently (as next minor).

CHANGELOG.md Outdated Show resolved Hide resolved
@kba @bertsky
Update CHANGELOG.md
8e809d0 
Co-authored-by: Robert Sachunsky <[email protected]>
@kba kba marked this pull request as ready for review December 8, 2021 10:36
@kba kba merged commit 8e809d0 into master Dec 8, 2021
@kba kba deleted the release-2.29.0 branch December 8, 2021 10:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bertsky bertsky bertsky approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kba @bertsky