From cffcaef68a7340c3c982ed1bb85c72eb1343cbbf7ea55e9cf99aae069f9eed46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Tue, 13 Sep 2022 07:06:16 +0000 Subject: [PATCH 1/5] Accepting request 1003019 from home:yarunachalam:branches:devel:languages:python MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - test failed due to markupsafe module missing Included markupsafe module - Update to 2.2.2: * Fix router to restore the 2.1 strict_slashes == False behaviour whereby leaf-requests match branch rules and vice versa. #2489 * Fix router to identify invalid rules rather than hang parsing them, and to correctly parse / within converter arguments. #2489 * Update subpackage imports in werkzeug.routing to use the import as syntax for explicitly re-exporting public attributes. #2493 * Parsing of some invalid header characters is more robust. #2494 * When starting the development server, a warning not to use it in a production deployment is always shown. #2480 * LocalProxy.__wrapped__ is always set to the wrapped object when the proxy is unbound, fixing an issue in doctest that would cause it to fail. #2485 * Address one ResourceWarning related to the socket used by run_simple. #2421 - Update to Version 2.2.1: * Fix router so that /path/ will match a rule /path if strict slashes mode is disabled for the rule. #2467 * Fix router so that partial part matches are not allowed i.e. /2df does not match /. #2470 * Fix router static part weighting, so that simpler routes are matched before more complex ones. #2471 * Restore ValidationError to be importable from werkzeug.routing. #2465 - Update to Version 2.2.0 * Deprecated get_script_name, get_query_string, peek_path_info, pop_path_info, and extract_path_info. #2461 * Remove previously deprecated code. #2461 * Add MarkupSafe as a dependency and use it to escape values when rendering HTML. #2419 * Added the werkzeug.debug.preserve_context mechanism for restoring context-local data for a request when running code in the debug console. #2439 * Fix compatibility with Python 3.11 by ensuring that end_lineno and end_col_offset are present on AST nodes. #2425 * Add a new faster matching router based on a state machine. #2433 * Fix branch leaf path masking branch paths when strict-slashes is disabled. #1074 * Names within options headers are always converted to lowercase. This matches RFC 6266 that the case is not relevant. #2442 * AnyConverter validates the value passed for it when building URLs. #2388 * The debugger shows enhanced error locations in tracebacks in Python 3.11. #2407 * Added Sans-IO is_resource_modified and parse_cookie functions based on WSGI versions. #2408 * Added Sans-IO get_content_length function. #2415 * Don’t assume a mimetype for test responses. #2450 OBS-URL: https://build.opensuse.org/request/show/1003019 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Werkzeug?expand=0&rev=70 --- Werkzeug-2.1.2.tar.gz | 3 --- Werkzeug-2.2.2.tar.gz | 3 +++ python-Werkzeug.changes | 40 ++++++++++++++++++++++++++++++++++++++++ python-Werkzeug.spec | 3 ++- 4 files changed, 45 insertions(+), 4 deletions(-) delete mode 100644 Werkzeug-2.1.2.tar.gz create mode 100644 Werkzeug-2.2.2.tar.gz diff --git a/Werkzeug-2.1.2.tar.gz b/Werkzeug-2.1.2.tar.gz deleted file mode 100644 index 70755fd..0000000 --- a/Werkzeug-2.1.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ce08e8093ed67d638d63879fd1ba3735817f7a80de3674d293f5984f25fb6e6 -size 835169 diff --git a/Werkzeug-2.2.2.tar.gz b/Werkzeug-2.2.2.tar.gz new file mode 100644 index 0000000..140a20f --- /dev/null +++ b/Werkzeug-2.2.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ea2d48322cc7c0f8b3a215ed73eabd7b5d75d0b50e31ab006286ccff9e00b8f +size 844378 diff --git a/python-Werkzeug.changes b/python-Werkzeug.changes index 0ec7019..f50a443 100644 --- a/python-Werkzeug.changes +++ b/python-Werkzeug.changes @@ -1,3 +1,43 @@ +------------------------------------------------------------------- +Mon Sep 12 16:14:15 UTC 2022 - Yogalakshmi Arunachalam + +- test failed due to markupsafe module missing + Included markupsafe module + +------------------------------------------------------------------- +Fri Sep 9 15:52:29 UTC 2022 - Yogalakshmi Arunachalam + +- Update to 2.2.2: + * Fix router to restore the 2.1 strict_slashes == False behaviour whereby leaf-requests match branch rules and vice versa. #2489 + * Fix router to identify invalid rules rather than hang parsing them, and to correctly parse / within converter arguments. #2489 + * Update subpackage imports in werkzeug.routing to use the import as syntax for explicitly re-exporting public attributes. #2493 + * Parsing of some invalid header characters is more robust. #2494 + * When starting the development server, a warning not to use it in a production deployment is always shown. #2480 + * LocalProxy.__wrapped__ is always set to the wrapped object when the proxy is unbound, fixing an issue in doctest that would cause it to fail. #2485 + * Address one ResourceWarning related to the socket used by run_simple. #2421 + +- Update to Version 2.2.1: + * Fix router so that /path/ will match a rule /path if strict slashes mode is disabled for the rule. #2467 + * Fix router so that partial part matches are not allowed i.e. /2df does not match /. #2470 + * Fix router static part weighting, so that simpler routes are matched before more complex ones. #2471 + * Restore ValidationError to be importable from werkzeug.routing. #2465 + +- Update to Version 2.2.0 + * Deprecated get_script_name, get_query_string, peek_path_info, pop_path_info, and extract_path_info. #2461 + * Remove previously deprecated code. #2461 + * Add MarkupSafe as a dependency and use it to escape values when rendering HTML. #2419 + * Added the werkzeug.debug.preserve_context mechanism for restoring context-local data for a request when running code in the debug console. #2439 + * Fix compatibility with Python 3.11 by ensuring that end_lineno and end_col_offset are present on AST nodes. #2425 + * Add a new faster matching router based on a state machine. #2433 + * Fix branch leaf path masking branch paths when strict-slashes is disabled. #1074 + * Names within options headers are always converted to lowercase. This matches RFC 6266 that the case is not relevant. #2442 + * AnyConverter validates the value passed for it when building URLs. #2388 + * The debugger shows enhanced error locations in tracebacks in Python 3.11. #2407 + * Added Sans-IO is_resource_modified and parse_cookie functions based on WSGI versions. #2408 + * Added Sans-IO get_content_length function. #2415 + * Don’t assume a mimetype for test responses. #2450 + * Type checking FileStorage accepts os.PathLike. #2418 + ------------------------------------------------------------------- Fri Jul 29 10:58:49 UTC 2022 - Torsten Gruner diff --git a/python-Werkzeug.spec b/python-Werkzeug.spec index 4f75668..cc8d6b6 100644 --- a/python-Werkzeug.spec +++ b/python-Werkzeug.spec @@ -28,7 +28,7 @@ %define skip_python2 1 %define skip_python36 1 Name: python-Werkzeug%{psuffix} -Version: 2.1.2 +Version: 2.2.2 Release: 0 Summary: The Swiss Army knife of Python web development License: BSD-3-Clause @@ -46,6 +46,7 @@ BuildRequires: %{python_module Werkzeug} BuildRequires: %{python_module cryptography} BuildRequires: %{python_module ephemeral-port-reserve} BuildRequires: %{python_module hypothesis} +BuildRequires: %{python_module markupsafe} BuildRequires: %{python_module pytest >= 6.2.4} BuildRequires: %{python_module pytest-timeout} BuildRequires: %{python_module pytest-xprocess} From 49125dbb65ef99d59abeb84be5d72ef8832e620b4b64f539bea5feeb2b81c6bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Tue, 13 Sep 2022 07:07:23 +0000 Subject: [PATCH 2/5] casing OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Werkzeug?expand=0&rev=71 --- python-Werkzeug.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-Werkzeug.spec b/python-Werkzeug.spec index cc8d6b6..2e359d2 100644 --- a/python-Werkzeug.spec +++ b/python-Werkzeug.spec @@ -46,7 +46,7 @@ BuildRequires: %{python_module Werkzeug} BuildRequires: %{python_module cryptography} BuildRequires: %{python_module ephemeral-port-reserve} BuildRequires: %{python_module hypothesis} -BuildRequires: %{python_module markupsafe} +BuildRequires: %{python_module MarkupSafe} BuildRequires: %{python_module pytest >= 6.2.4} BuildRequires: %{python_module pytest-timeout} BuildRequires: %{python_module pytest-xprocess} From f599fa790b617a07fec45275b8b4aa688f595dfa000d3bc4d011da01a2d5d5fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Wed, 14 Sep 2022 12:51:38 +0000 Subject: [PATCH 3/5] ...and requires OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Werkzeug?expand=0&rev=72 --- python-Werkzeug.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-Werkzeug.spec b/python-Werkzeug.spec index 2e359d2..7bd0413 100644 --- a/python-Werkzeug.spec +++ b/python-Werkzeug.spec @@ -55,6 +55,7 @@ BuildRequires: %{python_module sortedcontainers} %endif BuildRequires: fdupes BuildRequires: python-rpm-macros +Requires: python-MarkupSafe Recommends: python-termcolor Recommends: python-watchdog Obsoletes: python-Werkzeug-doc < %{version} From 25b9b07326d227e1ed11b901d6be34bee173ba62f5985136a3c8e48d07784b57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Wed, 14 Sep 2022 12:54:59 +0000 Subject: [PATCH 4/5] clean up OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Werkzeug?expand=0&rev=73 --- python-Werkzeug.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python-Werkzeug.spec b/python-Werkzeug.spec index 7bd0413..c0f74fd 100644 --- a/python-Werkzeug.spec +++ b/python-Werkzeug.spec @@ -46,7 +46,6 @@ BuildRequires: %{python_module Werkzeug} BuildRequires: %{python_module cryptography} BuildRequires: %{python_module ephemeral-port-reserve} BuildRequires: %{python_module hypothesis} -BuildRequires: %{python_module MarkupSafe} BuildRequires: %{python_module pytest >= 6.2.4} BuildRequires: %{python_module pytest-timeout} BuildRequires: %{python_module pytest-xprocess} @@ -55,7 +54,7 @@ BuildRequires: %{python_module sortedcontainers} %endif BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-MarkupSafe +Requires: python-MarkupSafe >= 2.1.1 Recommends: python-termcolor Recommends: python-watchdog Obsoletes: python-Werkzeug-doc < %{version} From d14dd3aac23e9f87233d4b6e0b68112a7b94779dc83637cc3dce9daa1f52592f Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 15 Sep 2022 05:44:44 +0000 Subject: [PATCH 5/5] Accepting request 1003613 from home:bnavigator:branches:devel:languages:python Superseding because there was a (incomplete) direct commit to the devel project in between - Clean some unused python2 python36 code from specfile - Move MarkupSafe to runtime requirement. Versioned. This is checked in multibuild test flavor as build requirement. OBS-URL: https://build.opensuse.org/request/show/1003613 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Werkzeug?expand=0&rev=74 --- python-Werkzeug.changes | 7 +++++++ python-Werkzeug.spec | 12 +++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/python-Werkzeug.changes b/python-Werkzeug.changes index f50a443..231dec1 100644 --- a/python-Werkzeug.changes +++ b/python-Werkzeug.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 13 17:13:05 UTC 2022 - Ben Greiner + +- Clean some unused python2 python36 code from specfile +- Move MarkupSafe to runtime requirement. Versioned. This is + checked in multibuild test flavor as build requirement. + ------------------------------------------------------------------- Mon Sep 12 16:14:15 UTC 2022 - Yogalakshmi Arunachalam diff --git a/python-Werkzeug.spec b/python-Werkzeug.spec index c0f74fd..82e1502 100644 --- a/python-Werkzeug.spec +++ b/python-Werkzeug.spec @@ -24,9 +24,7 @@ %define psuffix %{nil} %bcond_with test %endif -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define skip_python2 1 -%define skip_python36 1 + Name: python-Werkzeug%{psuffix} Version: 2.2.2 Release: 0 @@ -42,7 +40,7 @@ BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module setuptools_scm} BuildRequires: %{python_module setuptools} %if %{with test} -BuildRequires: %{python_module Werkzeug} +BuildRequires: %{python_module Werkzeug = %{version}} BuildRequires: %{python_module cryptography} BuildRequires: %{python_module ephemeral-port-reserve} BuildRequires: %{python_module hypothesis} @@ -60,9 +58,6 @@ Recommends: python-watchdog Obsoletes: python-Werkzeug-doc < %{version} Provides: python-Werkzeug-doc = %{version} BuildArch: noarch -%if 0%{?suse_version} < 1500 -BuildRequires: python -%endif %python_subpackages %description @@ -97,7 +92,6 @@ sed -i "1d" examples/manage-{i18nurls,simplewiki,shorty,couchy,cupoftee,webpylik %check %if %{with test} export LANG=en_US.UTF-8 -export PYTHONDONTWRITEBYTECODE=1 # workaround pytest 6.2 (like https://github.com/pallets/werkzeug/commit/16718f461d016b88b6457d3ef63816b7df1f0d1f, but shorter) %pytest -k 'not (dev_server or test_reloader_sys_path or test_chunked_encoding or test_basic or test_server or test_ssl or test_http_proxy or test_500_error or test_untrusted_host or test_double_slash_path or test_wrong_protocol or test_content_type_and_length or test_multiple_headers_concatenated or test_multiline_header_folding or test_exclude_patterns)' %endif @@ -107,7 +101,7 @@ export PYTHONDONTWRITEBYTECODE=1 %license LICENSE.rst %doc CHANGES.rst README.rst %{python_sitelib}/werkzeug -%{python_sitelib}/Werkzeug-%{version}-py*.egg-info +%{python_sitelib}/Werkzeug-%{version}*-info %endif %changelog