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.

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

#1240 backports for v2 #1275

Merged
merged 46 commits into from
Sep 30, 2024
Merged

#1240 backports for v2 #1275

merged 46 commits into from
Sep 30, 2024

Conversation

bertsky
Copy link
Collaborator

@bertsky bertsky commented Sep 24, 2024

As discussed this is basically a cherry-picked version of #1240 with just the fixes (and some minor additions to get tests running smoothly again).

Changelog must also be cherry-picked from, but that's completely manual and can be done after review.

Most importantly, this solves the problems with Pillow 10.

bertsky and others added 30 commits September 24, 2024 22:19
@bertsky bertsky requested a review from kba September 24, 2024 23:48
Copy link
Member

@kba kba left a comment

Choose a reason for hiding this comment

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

LGTM

src/ocrd/cli/ocrd_tool.py Show resolved Hide resolved
run_processor(processorClass, mets_url=mets, workspace=workspace, **kwargs)
atexit.register(goexit)
if log_filename:
log_ctx = redirect_stderr_and_stdout_to_file(log_filename)
Copy link
Member

Choose a reason for hiding this comment

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

BTW this is one of the things I got rid of in the fork for our k8s deployment.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Is it bad then? Should we remove it from the CLI?

Copy link
Member

Choose a reason for hiding this comment

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

No, but something we should discuss because that does not play well with k8s.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Oh, I see.

src/ocrd_utils/logging.py Outdated Show resolved Hide resolved
@kba kba merged commit c744dc8 into OCR-D:master Sep 30, 2024
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants