From 944d7a3e6efa78c0aff72dc74325891038e1d16d Mon Sep 17 00:00:00 2001 From: Marcel Telka Date: Fri, 1 Nov 2024 09:42:30 +0100 Subject: [PATCH] python/werkzeug: update to 3.1.0 --- components/python/werkzeug/.gitignore | 2 +- components/python/werkzeug/Makefile | 6 ++--- .../python/werkzeug/manifests/sample-manifest.p5m | 9 ------- components/python/werkzeug/patches/01-sunos5.patch | 4 +-- components/python/werkzeug/test/results-all.master | 31 +++++++++++++++++++--- components/python/werkzeug/werkzeug-PYVER.p5m | 9 ------- 6 files changed, 33 insertions(+), 28 deletions(-) diff --git a/components/python/werkzeug/.gitignore b/components/python/werkzeug/.gitignore index 9e77fde7f9..71eec437a2 100644 --- a/components/python/werkzeug/.gitignore +++ b/components/python/werkzeug/.gitignore @@ -1 +1 @@ -/werkzeug-3.0.6/ +/werkzeug-3.1.0/ diff --git a/components/python/werkzeug/Makefile b/components/python/werkzeug/Makefile index ae62c2e071..4a80f891a0 100644 --- a/components/python/werkzeug/Makefile +++ b/components/python/werkzeug/Makefile @@ -19,10 +19,10 @@ BUILD_STYLE = pyproject include ../../../make-rules/shared-macros.mk COMPONENT_NAME = werkzeug -HUMAN_VERSION = 3.0.6 +HUMAN_VERSION = 3.1.0 COMPONENT_SUMMARY = The comprehensive WSGI web application library. COMPONENT_ARCHIVE_HASH = \ - sha256:a8dd59d4de28ca70471a34cba79bed5f7ef2e036a76b3ab0835474246eb41f8d + sha256:6f2a0d38f25ba5a75c36c45b4ae350c7a23b57e3b974e9eb2d6851f2c648c00d COMPONENT_LICENSE = BSD-3-Clause COMPONENT_LICENSE_FILE = LICENSE.txt @@ -41,9 +41,7 @@ TEST_REQUIRED_PACKAGES.python += library/python/ephemeral-port-reserve TEST_REQUIRED_PACKAGES.python += library/python/iniconfig TEST_REQUIRED_PACKAGES.python += library/python/packaging TEST_REQUIRED_PACKAGES.python += library/python/pluggy -TEST_REQUIRED_PACKAGES.python += library/python/psutil TEST_REQUIRED_PACKAGES.python += library/python/pycparser TEST_REQUIRED_PACKAGES.python += library/python/pytest TEST_REQUIRED_PACKAGES.python += library/python/pytest-timeout -TEST_REQUIRED_PACKAGES.python += library/python/pytest-xprocess TEST_REQUIRED_PACKAGES.python += library/python/watchdog diff --git a/components/python/werkzeug/manifests/sample-manifest.p5m b/components/python/werkzeug/manifests/sample-manifest.p5m index fbbd8c9890..5ebee25fec 100644 --- a/components/python/werkzeug/manifests/sample-manifest.p5m +++ b/components/python/werkzeug/manifests/sample-manifest.p5m @@ -31,24 +31,15 @@ file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/_internal.py file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/_reloader.py file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/accept.py -file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/accept.pyi file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/auth.py file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/cache_control.py -file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/cache_control.pyi file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/csp.py -file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/csp.pyi file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/etag.py -file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/etag.pyi file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/file_storage.py -file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/file_storage.pyi file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/headers.py -file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/headers.pyi file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/mixins.py -file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/mixins.pyi file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/range.py -file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/range.pyi file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/structures.py -file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/structures.pyi file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/debug/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/debug/console.py file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/debug/repr.py diff --git a/components/python/werkzeug/patches/01-sunos5.patch b/components/python/werkzeug/patches/01-sunos5.patch index 0d1073daf6..d9473a54f2 100644 --- a/components/python/werkzeug/patches/01-sunos5.patch +++ b/components/python/werkzeug/patches/01-sunos5.patch @@ -1,7 +1,7 @@ https://github.com/pallets/werkzeug/pull/2773 ---- werkzeug-3.0.6/src/werkzeug/debug/__init__.py.orig -+++ werkzeug-3.0.6/src/werkzeug/debug/__init__.py +--- werkzeug-3.1.0/src/werkzeug/debug/__init__.py.orig ++++ werkzeug-3.1.0/src/werkzeug/debug/__init__.py @@ -120,6 +120,15 @@ except OSError: pass diff --git a/components/python/werkzeug/test/results-all.master b/components/python/werkzeug/test/results-all.master index e53220a9d8..5576a41c24 100644 --- a/components/python/werkzeug/test/results-all.master +++ b/components/python/werkzeug/test/results-all.master @@ -6,7 +6,7 @@ cachedir: .tox/py$(PYV)/.pytest_cache rootdir: $(@D) configfile: pyproject.toml testpaths: tests -collecting ... collected 914 items / 25 deselected / 889 selected +collecting ... collected 940 items / 25 deselected / 915 selected tests/middleware/test_dispatcher.py::test_dispatcher PASSED tests/middleware/test_lint.py::test_lint_middleware PASSED @@ -92,20 +92,30 @@ tests/test_datastructures.py::TestNativeItermethods::test_basic PASSED tests/test_datastructures.py::TestImmutableTypeConversionDict::test_follows_dict_interface PASSED tests/test_datastructures.py::TestImmutableTypeConversionDict::test_copies_are_mutable PASSED tests/test_datastructures.py::TestImmutableTypeConversionDict::test_dict_is_hashable PASSED +tests/test_datastructures.py::TestImmutableTypeConversionDict::test_or PASSED +tests/test_datastructures.py::TestImmutableTypeConversionDict::test_ior PASSED tests/test_datastructures.py::TestImmutableMultiDict::test_follows_dict_interface PASSED tests/test_datastructures.py::TestImmutableMultiDict::test_copies_are_mutable PASSED tests/test_datastructures.py::TestImmutableMultiDict::test_dict_is_hashable PASSED +tests/test_datastructures.py::TestImmutableMultiDict::test_or PASSED +tests/test_datastructures.py::TestImmutableMultiDict::test_ior PASSED tests/test_datastructures.py::TestImmutableMultiDict::test_multidict_is_hashable PASSED tests/test_datastructures.py::TestImmutableDict::test_follows_dict_interface PASSED tests/test_datastructures.py::TestImmutableDict::test_copies_are_mutable PASSED tests/test_datastructures.py::TestImmutableDict::test_dict_is_hashable PASSED +tests/test_datastructures.py::TestImmutableDict::test_or PASSED +tests/test_datastructures.py::TestImmutableDict::test_ior PASSED tests/test_datastructures.py::TestImmutableOrderedMultiDict::test_follows_dict_interface PASSED tests/test_datastructures.py::TestImmutableOrderedMultiDict::test_copies_are_mutable PASSED tests/test_datastructures.py::TestImmutableOrderedMultiDict::test_dict_is_hashable PASSED +tests/test_datastructures.py::TestImmutableOrderedMultiDict::test_or PASSED +tests/test_datastructures.py::TestImmutableOrderedMultiDict::test_ior PASSED tests/test_datastructures.py::TestImmutableOrderedMultiDict::test_ordered_multidict_is_hashable PASSED tests/test_datastructures.py::TestMultiDict::test_pickle PASSED tests/test_datastructures.py::TestMultiDict::test_multidict_dict_interop PASSED tests/test_datastructures.py::TestMultiDict::test_basic_interface PASSED +tests/test_datastructures.py::TestMultiDict::test_or PASSED +tests/test_datastructures.py::TestMultiDict::test_ior PASSED tests/test_datastructures.py::TestMultiDict::test_multidict_pop PASSED tests/test_datastructures.py::TestMultiDict::test_multidict_pop_raise_badrequestkeyerror_for_empty_list_value PASSED tests/test_datastructures.py::TestMultiDict::test_multidict_popitem_raise_badrequestkeyerror_for_empty_list_value PASSED @@ -115,6 +125,8 @@ tests/test_datastructures.py::TestMultiDict::test_getitem_raise_badrequestkeyerr tests/test_datastructures.py::TestOrderedMultiDict::test_pickle PASSED tests/test_datastructures.py::TestOrderedMultiDict::test_multidict_dict_interop PASSED tests/test_datastructures.py::TestOrderedMultiDict::test_basic_interface PASSED +tests/test_datastructures.py::TestOrderedMultiDict::test_or PASSED +tests/test_datastructures.py::TestOrderedMultiDict::test_ior PASSED tests/test_datastructures.py::TestOrderedMultiDict::test_ordered_interface PASSED tests/test_datastructures.py::TestOrderedMultiDict::test_iterables PASSED tests/test_datastructures.py::TestOrderedMultiDict::test_get_description PASSED @@ -136,15 +148,24 @@ tests/test_datastructures.py::TestHeaders::test_setlist PASSED tests/test_datastructures.py::TestHeaders::test_setlistdefault PASSED tests/test_datastructures.py::TestHeaders::test_to_wsgi_list PASSED tests/test_datastructures.py::TestHeaders::test_equality PASSED +tests/test_datastructures.py::TestHeaders::test_or PASSED +tests/test_datastructures.py::TestHeaders::test_ior PASSED tests/test_datastructures.py::TestEnvironHeaders::test_basic_interface PASSED tests/test_datastructures.py::TestEnvironHeaders::test_skip_empty_special_vars PASSED tests/test_datastructures.py::TestEnvironHeaders::test_return_type_is_str PASSED +tests/test_datastructures.py::TestEnvironHeaders::test_or PASSED +tests/test_datastructures.py::TestEnvironHeaders::test_ior PASSED tests/test_datastructures.py::TestHeaderSet::test_basic_interface PASSED tests/test_datastructures.py::TestImmutableList::test_list_hashable PASSED tests/test_datastructures.py::TestCallbackDict::test_callback_dict_reads PASSED tests/test_datastructures.py::TestCallbackDict::test_callback_dict_writes PASSED tests/test_datastructures.py::TestCacheControl::test_repr PASSED tests/test_datastructures.py::TestCacheControl::test_set_none PASSED +tests/test_datastructures.py::TestCacheControl::test_no_transform PASSED +tests/test_datastructures.py::TestCacheControl::test_min_fresh PASSED +tests/test_datastructures.py::TestCacheControl::test_must_understand PASSED +tests/test_datastructures.py::TestCacheControl::test_stale_while_revalidate PASSED +tests/test_datastructures.py::TestCacheControl::test_stale_if_error PASSED tests/test_datastructures.py::TestContentSecurityPolicy::test_construct PASSED tests/test_datastructures.py::TestContentSecurityPolicy::test_properties PASSED tests/test_datastructures.py::TestAccept::test_accept_basic PASSED @@ -225,6 +246,7 @@ tests/test_exceptions.py::test_aborter_general[test15] PASSED tests/test_exceptions.py::test_aborter_general[test16] PASSED tests/test_exceptions.py::test_aborter_general[test17] PASSED tests/test_exceptions.py::test_aborter_general[test18] PASSED +tests/test_exceptions.py::test_aborter_general[test19] PASSED tests/test_exceptions.py::test_abort_description_markup PASSED tests/test_exceptions.py::test_aborter_custom PASSED tests/test_exceptions.py::test_exception_repr PASSED @@ -250,6 +272,7 @@ tests/test_exceptions.py::test_passing_response[UnsupportedMediaType] PASSED tests/test_exceptions.py::test_passing_response[RequestedRangeNotSatisfiable] PASSED tests/test_exceptions.py::test_passing_response[ExpectationFailed] PASSED tests/test_exceptions.py::test_passing_response[ImATeapot] PASSED +tests/test_exceptions.py::test_passing_response[MisdirectedRequest] PASSED tests/test_exceptions.py::test_passing_response[UnprocessableEntity] PASSED tests/test_exceptions.py::test_passing_response[Locked] PASSED tests/test_exceptions.py::test_passing_response[FailedDependency] PASSED @@ -281,6 +304,7 @@ tests/test_exceptions.py::test_response_body[UnsupportedMediaType] PASSED tests/test_exceptions.py::test_response_body[RequestedRangeNotSatisfiable] PASSED tests/test_exceptions.py::test_response_body[ExpectationFailed] PASSED tests/test_exceptions.py::test_response_body[ImATeapot] PASSED +tests/test_exceptions.py::test_response_body[MisdirectedRequest] PASSED tests/test_exceptions.py::test_response_body[UnprocessableEntity] PASSED tests/test_exceptions.py::test_response_body[Locked] PASSED tests/test_exceptions.py::test_response_body[FailedDependency] PASSED @@ -405,6 +429,8 @@ tests/test_http.py::TestHTTPUtility::test_cookie_samesite_attribute[lax-foo=bar; tests/test_http.py::TestHTTPUtility::test_cookie_samesite_attribute[none-foo=bar; SameSite=None] PASSED tests/test_http.py::TestHTTPUtility::test_cookie_samesite_attribute[None-foo=bar] PASSED tests/test_http.py::TestHTTPUtility::test_cookie_samesite_invalid PASSED +tests/test_http.py::TestHTTPUtility::test_cookie_partitioned PASSED +tests/test_http.py::TestHTTPUtility::test_cookie_partitioned_sets_secure PASSED tests/test_http.py::TestRange::test_if_range_parsing PASSED tests/test_http.py::TestRange::test_range_parsing PASSED tests/test_http.py::TestRange::test_content_range_parsing PASSED @@ -898,7 +924,6 @@ tests/test_wsgi.py::test_get_current_url_invalid_utf8 PASSED tests/test_wsgi.py::test_range_wrapper PASSED tests/test_wsgi.py::test_closing_iterator PASSED -======== 889 passed, 25 deselected ======== -pytest-xprocess reminder::Be sure to terminate the started process by running 'pytest --xkill' if you have not explicitly done so in your fixture with 'xprocess.getinfo().terminate()'. +======== 915 passed, 25 deselected ======== py$(PYV): OK congratulations :) diff --git a/components/python/werkzeug/werkzeug-PYVER.p5m b/components/python/werkzeug/werkzeug-PYVER.p5m index f4dff471db..52c920ad7c 100644 --- a/components/python/werkzeug/werkzeug-PYVER.p5m +++ b/components/python/werkzeug/werkzeug-PYVER.p5m @@ -31,24 +31,15 @@ file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/_internal.py file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/_reloader.py file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/accept.py -file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/accept.pyi file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/auth.py file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/cache_control.py -file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/cache_control.pyi file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/csp.py -file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/csp.pyi file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/etag.py -file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/etag.pyi file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/file_storage.py -file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/file_storage.pyi file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/headers.py -file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/headers.pyi file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/mixins.py -file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/mixins.pyi file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/range.py -file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/range.pyi file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/structures.py -file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/datastructures/structures.pyi file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/debug/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/debug/console.py file path=usr/lib/python$(PYVER)/vendor-packages/werkzeug/debug/repr.py -- 2.11.4.GIT