From d14dd3aac23e9f87233d4b6e0b68112a7b94779dc83637cc3dce9daa1f52592f Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 15 Sep 2022 05:44:44 +0000 Subject: [PATCH] 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