diff --git a/CHANGELOG.md b/CHANGELOG.md index ad18302ad2..fcd01d11b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ Versioned according to [Semantic Versioning](http://semver.org/). ## Unreleased +## [2.67.2] - 2024-07-19 + +Fixed: + + * Run `multiprocessing.set_start_method('fork')` only for OSX, #1261 + * Broken PyPI release, #1262 + ## [2.67.1] - 2024-07-17 Fixed: @@ -2133,6 +2140,7 @@ Fixed Initial Release +[2.67.2]: ../../compare/v2.67.2..v2.67.1 [2.67.1]: ../../compare/v2.67.1..v2.67.0 [2.67.0]: ../../compare/v2.67.0..v2.66.1 [2.66.1]: ../../compare/v2.66.1..v2.66.0 diff --git a/Makefile b/Makefile index e9cb9ca169..0608b0b738 100644 --- a/Makefile +++ b/Makefile @@ -400,7 +400,7 @@ docker docker-cuda docker-cuda-tf1 docker-cuda-tf2 docker-cuda-torch: # Build wheels and source dist and twine upload them pypi: build - twine upload dist/ocrd-$(VERSION)*{tar.gz,whl} + twine upload --verbose dist/ocrd-$(VERSION)*{tar.gz,whl} pypi-workaround: build-workaround for dist in $(BUILD_ORDER);do twine upload dist/$$dist-$(VERSION)*{tar.gz,whl};done diff --git a/VERSION b/VERSION index 9db2e998b3..456312b41f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.67.1 +2.67.2 diff --git a/tests/cli/test_process.py b/tests/cli/test_process.py index 32fc02fed0..d123e857bd 100644 --- a/tests/cli/test_process.py +++ b/tests/cli/test_process.py @@ -4,7 +4,9 @@ from contextlib import ExitStack from multiprocessing import Process, set_start_method # necessary for macos -set_start_method("fork") +from sys import platform +if platform == "darwin": + set_start_method("fork") from ocrd import Resolver, Workspace, OcrdMetsServer from ocrd.cli import process_cli