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

#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

Commits on Sep 24, 2024

  1. processor CLI: delegate --resolve-resource, too

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    5663f48 View commit details
    Browse the repository at this point in the history

  2. test_mets_server: fix arg vs kwarg

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    853bdb5 View commit details
    Browse the repository at this point in the history

  3. mets_server: ClientSideOcrdMets needs OcrdMets-like kwargs (without d… 

    …eprecation)
    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    33c7386 View commit details
    Browse the repository at this point in the history

  4. use up-to-date kwargs (avoiding old deprecations)

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    37f7cda View commit details
    Browse the repository at this point in the history

  5. hide/test expected deprecation warnings

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    44946ba View commit details
    Browse the repository at this point in the history

  6. improve output in case of assertion failures

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    d0962d6 View commit details
    Browse the repository at this point in the history

  7. allow "from ocrd_models import OcrdPage

    @kba @bertsky
    kba authored and bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    061f023 View commit details
    Browse the repository at this point in the history

  8. ocrd_utils: forgot to export scale_coordinates at toplvl

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    d2f92d1 View commit details
    Browse the repository at this point in the history

  9. fix imports

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    c6c5c42 View commit details
    Browse the repository at this point in the history

  10. Processor.zip_input_files: warning instead of exception for missing i… 

    …nput files
    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    245778c View commit details
    Browse the repository at this point in the history

  11. Processor.zip_input_files: more verbose log msg 

    Co-authored-by: Konstantin Baierer <[email protected]>
    @bertsky @kba
    bertsky and kba committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    1f7b57f View commit details
    Browse the repository at this point in the history

  12. tests report.is_valid: improve output on failure

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    35bdb39 View commit details
    Browse the repository at this point in the history

  13. fix --log-filename (6fc6060): apply in ocrd_cli_wrap_processor

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    e595996 View commit details
    Browse the repository at this point in the history

  14. fix exception

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    f21b8d2 View commit details
    Browse the repository at this point in the history

  15. adapt to PIL.Image moved constants

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    0cbd3ea View commit details
    Browse the repository at this point in the history

  16. cli.workspace: pass fileGrp as well, improve description

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    8f8912c View commit details
    Browse the repository at this point in the history

  17. OcrdMets.add_agent: does not have positional args

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    6dccfb3 View commit details
    Browse the repository at this point in the history

  18. update pylintrc

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    2d85f14 View commit details
    Browse the repository at this point in the history

  19. pylint: try ignoring generateds (again)

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    ea68370 View commit details
    Browse the repository at this point in the history

  20. ClientSideOcrdMets: use same logger name prefix as server

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    18ac2c0 View commit details
    Browse the repository at this point in the history

  21. test_mets_server: use tmpdir to avoid side effects between suites

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    da37967 View commit details
    Browse the repository at this point in the history

  22. disableLogging: re-instate root logger, to

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    ccb416b View commit details
    Browse the repository at this point in the history

  23. test-logging: also remove ocrd.log from tempdir

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    7e3cdf4 View commit details
    Browse the repository at this point in the history

  24. bashlib: re-add --log-filename, implement as stderr redirect

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    4f45b12 View commit details
    Browse the repository at this point in the history

  25. ocrd_utils.config: add reset_defaults()

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    7b70c90 View commit details
    Browse the repository at this point in the history

  26. add test for OcrdEnvConfig.reset_defaults()

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    48bb3c2 View commit details
    Browse the repository at this point in the history

  27. Workspace.reload_mets: fix for METS server case

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    ed92403 View commit details
    Browse the repository at this point in the history

  28. OcrdMetsServer.add_file: pass on 'force' kwarg, too

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    9c3c399 View commit details
    Browse the repository at this point in the history

  29. test_mets_server: add test for force (overwrite)

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    c077e95 View commit details
    Browse the repository at this point in the history

  30. PcGts.Page.id / make_xml_id: replace '/' with '_'

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    4492168 View commit details
    Browse the repository at this point in the history

  31. METS Server: also export+delegate physical_pages

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    83d52d8 View commit details
    Browse the repository at this point in the history

  32. ocrd.cli.workspace: consistently pass on --mets-server-url and --back… 

    …up (also, simplify)
    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    4eccefc View commit details
    Browse the repository at this point in the history

  33. ocrd.cli.workspace server: add 'reload' and 'save'

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    083df27 View commit details
    Browse the repository at this point in the history

  34. ocrd.cli.validate tasks: pass on --mets-server-url, too

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    b2c0161 View commit details
    Browse the repository at this point in the history

  35. run_processor: be robust if ocrd_tool is missing steps

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    203a06a View commit details
    Browse the repository at this point in the history

  36. lib.bash: fix errexit

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    4fbdd00 View commit details
    Browse the repository at this point in the history

  37. tests: make sure ocrd_utils.config gets reset whenever changing it gl… 

    …obally
    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    c865079 View commit details
    Browse the repository at this point in the history

  38. ocrd.cli.workspace: assert non-server in cmds mutating METS

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    1a13cd3 View commit details
    Browse the repository at this point in the history

  39. OcrdPage: add PageType.get_ReadingOrderGroups()

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    bba597e View commit details
    Browse the repository at this point in the history

  40. update OcrdPage from generateds

    @bertsky
    bertsky committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    fa0fada View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. OcrdMets.get_physical_pages: cover return_divs w/o for_fileIds for_pa… 

    …geIds
    @bertsky
    bertsky committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    9641d4a View commit details
    Browse the repository at this point in the history

  2. ocrd.cli.workspace: use physical_pages if possible, fix default outpu… 

    …t_field
    @bertsky
    bertsky committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    19ce7d9 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. disableLogging: clearer comment 

    Co-authored-by: Konstantin Baierer <[email protected]>
    @bertsky @kba
    bertsky and kba authored Sep 30, 2024
    Configuration menu
    Copy the full SHA
    606915b View commit details
    Browse the repository at this point in the history

  2. 📝 changelog

    @kba
    kba committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    3b908a6 View commit details
    Browse the repository at this point in the history

  3. 📝 changelog: remove spurious entries

    @kba
    kba committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    343a66a View commit details
    Browse the repository at this point in the history

  4. 📝 update changelog again

    @bertsky
    bertsky authored Sep 30, 2024
    Configuration menu
    Copy the full SHA
    f808b72 View commit details
    Browse the repository at this point in the history