Sync from SUSE:SLFO:1.1 python-MarkupSafe revision e05846ca36d1dbc0e658be2516daffda

_multibuild

@@ -1,3 +0,0 @@
-<multibuild>
-  <package>test</package>
-</multibuild>

python-MarkupSafe.changes

@@ -1,73 +1,3 @@
--------------------------------------------------------------------
-Wed Apr 30 09:17:07 UTC 2025 - Nico Krapp <nico.krapp@suse.com>
-
-- Update to 3.0.2
-  * Fix compatibility when __str__ returns a str subclass. #472
-  * Build requires setuptools >= 70.1. #475
-- Update to 3.0.1
-  * Address compiler warnings that became errors in GCC 14. #466
-  * Fix compatibility with proxy objects. #467
-- Update to 3.0.0
-  * Support Python 3.13 and its experimental free-threaded build. #461
-  * Drop support for Python 3.7 and 3.8.
-  * Use modern packaging metadata with pyproject.toml instead
-    of setup.cfg. #348
-  * Change distutils imports to setuptools. #399
-  * Use deferred evaluation of annotations. #400
-  * Update signatures for Markup methods to match str signatures.
-    Use positional-only arguments. #400
-  * Some str methods on Markup no longer escape their argument: strip,
-    lstrip, rstrip, removeprefix, removesuffix, partition, and
-    rpartition; replace only escapes its new argument. These methods
-    are conceptually linked to search methods such as in, find, and
-    index, which already do not escape their argument. #401
-  * The __version__ attribute is deprecated. Use feature detection,
-    or importlib.metadata.version("markupsafe"), instead. #402
-  * Speed up escaping plain strings by 40%. #434
-  * Simplify speedups implementation. #437
-
--------------------------------------------------------------------
-Tue Apr  1 12:30:12 UTC 2025 - Markéta Machová <mmachova@suse.com>
-
-- Make the dist-info name case-insensitive
-
--------------------------------------------------------------------
-Tue Mar 25 03:17:06 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
-
-- Lowercase metadata directory name.
-
--------------------------------------------------------------------
-Thu Feb 20 08:14:24 UTC 2025 - Dirk Müller <dmueller@suse.com>
-
-- split test dependencies into a multibuild to break cycle
-  with pytest
-
--------------------------------------------------------------------
-Wed Dec  4 23:21:41 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
-
-- The test suite survives without
-  ca-certificates-mozilla-prebuilt now, so we can remove BR (and
-  avoid deadly cycles).
-
--------------------------------------------------------------------
-Thu Jul 11 14:26:38 UTC 2024 - Dirk Müller <dmueller@suse.com>
-
-- add buildignores to break buildcycle over
-  p11-kit/dbus-1/systemd:mini/python-MarkupSafe
-
--------------------------------------------------------------------
-Sun Feb  4 10:45:37 UTC 2024 - Dirk Müller <dmueller@suse.com>
-
-- update to 2.1.5:
-  * Fix striptags not collapsing spaces. :issue:`417`
-
--------------------------------------------------------------------
-Fri Jan 26 21:18:09 UTC 2024 - Dirk Müller <dmueller@suse.com>
-
-- update to 2.1.4:
-  * Don't use regular expressions for striptags, avoiding a
-    performance issue. :pr:`413`
-
 -------------------------------------------------------------------
 Mon Jun 19 20:10:45 UTC 2023 - Dirk Müller <dmueller@suse.com>
 
@@ -96,7 +26,7 @@ Sun Jan 29 18:13:20 UTC 2023 - Dirk Müller <dmueller@suse.com>
 -------------------------------------------------------------------
 Fri Jun 24 02:55:18 UTC 2022 - Manuel Jacob <me@manueljacob.de>
 
-- Patch PKG-INFO to avoid pip failing on Python 3.6 with
+- Patch PKG-INFO to avoid pip failing on Python 3.6 with 
   `ERROR: Package 'MarkupSafe' requires a different Python:
    3.6.15 not in '>=3.7'`.
 
@@ -206,7 +136,7 @@ Thu May  8 13:51:56 UTC 2014 - toddrme2178@gmail.com
 
 - Update to 0.21
   + No upstream changelog
-
+  
   -------------------------------------------------------------------
 Thu Mar 13 14:03:44 UTC 2014 - mcihar@suse.cz
 
@@ -229,7 +159,7 @@ Tue Jun 25 11:56:41 UTC 2013 - dmueller@suse.com
 Wed May 23 05:24:01 UTC 2012 - highwaystar.ru@gmail.com
 
 - python3 package added
-- minor spec improvement
+- minor spec improvement 
 
 -------------------------------------------------------------------
 Thu Sep  8 20:24:51 UTC 2011 - andrea.turrini@gmail.com

python-MarkupSafe.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-MarkupSafe
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,32 +16,23 @@
 #
 
 
-%global flavor @BUILD_FLAVOR@%{nil}
-%if "%{flavor}" == "test"
-%define psuffix -%{flavor}
 %bcond_without test
-%else
-%define psuffix %{nil}
-%bcond_with test
-%endif
 %{?sle15_python_module_pythons}
-Name:           python-MarkupSafe%{psuffix}
+Name:           python-MarkupSafe
-Version:        3.0.2
+Version:        2.1.3
 Release:        0
 Summary:        Implements a XML/HTML/XHTML Markup safe string for Python
 License:        BSD-3-Clause
 Group:          Development/Languages/Python
 URL:            https://github.com/pallets/markupsafe
-Source:         https://files.pythonhosted.org/packages/source/M/MarkupSafe/markupsafe-%{version}.tar.gz
+Source:         https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-%{version}.tar.gz
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module pip}
-BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-base >= 3.6
 %if %{with test}
-BuildRequires:  %{python_module MarkupSafe >= %{version}}
 BuildRequires:  %{python_module pytest}
 %endif
 %python_subpackages
@@ -51,22 +42,19 @@ Implements a unicode subclass that supports HTML strings. This can be used to
 safely encode strings for dynamically generated web pages.
 
 %prep
-%autosetup -p1 -n markupsafe-%{version}
+%setup -q -n MarkupSafe-%{version}
-
-# Upstream changed the Python package metadata to require Python 3.7, but the tests pass on Python 3.6.
-sed -i -e '/^python_requires =/s/3\.7/3\.6/' setup.cfg
 
 %build
-%if !%{with test}
 export CFLAGS="%{optflags}"
 %pyproject_wheel
-%endif
 
 %install
-%if !%{with test}
 %pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitearch}
 %python_expand rm %{buildroot}%{$python_sitearch}/markupsafe/_speedups.c
+# Upstream changed the Python package metadata to require Python 3.7, but the tests pass on Python 3.6.
+%if %python_version_nodots == 36
+%python_expand sed 's/Requires-Python: >=3.7/Requires-Python: >=3.6/' -i %{buildroot}%{python_sitearch}/MarkupSafe-%{version}-py3.6.egg-info/PKG-INFO
 %endif
 
 %if %{with test}
@@ -74,12 +62,10 @@ export CFLAGS="%{optflags}"
 %pytest_arch
 %endif
 
-%if !%{with test}
 %files %{python_files}
-%license LICENSE.txt
+%license LICENSE.rst
-%doc README.md docs/
+%doc README.rst docs/
 %{python_sitearch}/markupsafe/
-%{python_sitearch}/[mM]arkup[sS]afe-%{version}.dist-info
+%{python_sitearch}/MarkupSafe-%{version}.dist-info
-%endif
 
 %changelog