Accepting request 1300744 from devel:languages:python

- Convert to libalternatives on SLE-16-based and newer systems only

OBS-URL: https://build.opensuse.org/request/show/1300744
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-Markdown?expand=0&rev=56

Markdown-3.6.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ed4f41f6daecbeeb96e576ce414c41d2d876daa9a16cb35fa8ed8c2ddfad0224
-size 354715

_multibuild

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

fix-py314.patch

@@ -0,0 +1,54 @@
+From 15346cd3a73f108bf11c57907b32737f8365d6bd Mon Sep 17 00:00:00 2001
+From: facelessuser <faceless.shop@gmail.com>
+Date: Mon, 21 Jul 2025 08:56:43 -0600
+Subject: [PATCH] Fix failing cases for Python 3.14
+
+New change requires us to monkey patch `locatetagend` to prevent
+capturing incomplete tags in code spans.
+---
+ docs/changelog.md      |    6 ++++++
+ markdown/htmlparser.py |   14 ++++++++++++++
+ 2 files changed, 20 insertions(+)
+
+Index: markdown-3.8.2/docs/changelog.md
+===================================================================
+--- markdown-3.8.2.orig/docs/changelog.md	2025-06-19 19:12:28.000000000 +0200
++++ markdown-3.8.2/docs/changelog.md	2025-08-12 21:13:46.980036183 +0200
+@@ -10,6 +10,12 @@
+ [Python Version Specification]: https://packaging.python.org/en/latest/specifications/version-specifiers/.
+ See the [Contributing Guide](contributing.md) for details.
+ 
++## [Unreleased]
++
++### Fixed
++
++* Fix handling of incomplete HTML tags in code spans in Python 3.14.
++
+ ## [3.8.2] - 2025-06-19
+ 
+ ### Fixed
+Index: markdown-3.8.2/markdown/htmlparser.py
+===================================================================
+--- markdown-3.8.2.orig/markdown/htmlparser.py	2025-06-19 19:12:28.000000000 +0200
++++ markdown-3.8.2/markdown/htmlparser.py	2025-08-12 21:13:46.980214669 +0200
+@@ -69,6 +69,20 @@
+    )?
+   \s*                                 # trailing whitespace
+ """, re.VERBOSE)
++htmlparser.locatetagend = re.compile(r"""
++  [a-zA-Z][^`\t\n\r\f />]*           # tag name
++  [\t\n\r\f /]*                     # optional whitespace before attribute name
++  (?:(?<=['"\t\n\r\f /])[^`\t\n\r\f />][^\t\n\r\f /=>]*  # attribute name
++    (?:=                            # value indicator
++      (?:'[^']*'                    # LITA-enclosed value
++        |"[^"]*"                    # LIT-enclosed value
++        |(?!['"])[^>\t\n\r\f ]*     # bare value
++       )
++     )?
++    [\t\n\r\f /]*                   # possibly followed by a space
++   )*
++   >?
++""", re.VERBOSE)
+ 
+ # Match a blank line at the start of a block of text (two newlines).
+ # The newlines may be preceded by additional whitespace.

markdown-3.0-python37.patch

@@ -1,6 +1,10 @@
---- Markdown-3.0/tests/test_legacy.py.orig	2018-10-18 20:59:01.521952070 +0200
-+++ Markdown-3.0/tests/test_legacy.py	2018-10-18 20:59:20.746395446 +0200
-@@ -29,6 +29,7 @@
+---
+ tests/test_legacy.py |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/tests/test_legacy.py
++++ b/tests/test_legacy.py
+@@ -28,6 +28,7 @@ warnings.simplefilter('error')
  # Except for the warnings that shouldn't
  warnings.filterwarnings('default', category=PendingDeprecationWarning)
  warnings.filterwarnings('default', category=DeprecationWarning, module='markdown')

python-Markdown.changes

@@ -1,3 +1,97 @@
+-------------------------------------------------------------------
+Thu Aug 21 09:30:43 UTC 2025 - Markéta Machová <mmachova@suse.com>
+
+- Convert to libalternatives on SLE-16-based and newer systems only
+
+-------------------------------------------------------------------
+Tue Aug 12 18:28:43 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
+
+- Add fix-py314.patch to fix failing tests on 3.14.* or 3.13.6+
+  (gh#Python-Markdown/markdown#1547).
+
+-------------------------------------------------------------------
+Wed Aug  6 18:16:02 UTC 2025 - Benoît Monin <benoit.monin@gmx.fr>
+
+- set the minimum version of setuptools to 77.0 to match upstream
+  pyproject.toml
+
+-------------------------------------------------------------------
+Fri Jul 11 10:56:26 UTC 2025 - Markéta Machová <mmachova@suse.com>
+
+- Convert to libalternatives
+
+-------------------------------------------------------------------
+Thu Jun 19 19:01:44 UTC 2025 - Benoît Monin <benoit.monin@gmx.fr>
+
+- update to version 3.8.2:
+  * Fix codecs deprecation in Python 3.14.
+  * Fix issue with unclosed comment parsing in Python 3.14.
+  * Fix issue with unclosed declarations in Python 3.14.
+  * Fix issue with unclosed HTML tag <foo and Python 3.14.
+
+-------------------------------------------------------------------
+Wed Jun 18 16:36:45 UTC 2025 - Benoît Monin <benoit.monin@gmx.fr>
+
+- update to version 3.8.1:
+  * Ensure incomplete markup declaration in raw HTML doesn’t crash
+    parser (#1534).
+  * Fixed dropped content in md_in_html (#1526).
+  * Fixed HTML handling corner case that prevented some content
+    from not being rendered (#1528).
+
+-------------------------------------------------------------------
+Fri Apr 11 20:28:38 UTC 2025 - Benoît Monin <benoit.monin@gmx.fr>
+
+- update to version 3.8:
+  * Changed
+    + DRY fix in abbr extension by introducing method
+      create_element (#1483).
+    + Clean up test directory by removing some redundant tests and
+      port non-redundant cases to the newer test framework.
+    + Improved performance of the raw HTML post-processor (#1510).
+  * Fixed
+    + Backslash Unescape IDs set via attr_list on toc (#1493).
+    + Ensure md_in_html processes content inside “markdown” blocks
+      as they are parsed outside of “markdown” blocks to keep
+      things more consistent for third-party extensions (#1503).
+    + md_in_html handle tags within inline code blocks better
+      (#1075).
+    + md_in_html fix handling of one-liner block HTML handling
+      (#1074).
+    + Ensure <center> is treated like a block-level element
+      (#1481).
+    + Ensure that abbr extension respects AtomicString and does not
+      process perceived abbreviations in these strings (#1512).
+    + Ensure smarty extension correctly renders nested closing
+      quotes (#1514).
+
+-------------------------------------------------------------------
+Tue Apr  1 11:32:19 UTC 2025 - Markéta Machová <mmachova@suse.com>
+
+- Make the metadata directory name case-insensitive.
+
+-------------------------------------------------------------------
+Tue Mar 25 03:13:19 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Lowercase metadata directory name.
+
+-------------------------------------------------------------------
+Sat Aug 17 10:27:01 UTC 2024 - Benoît Monin <benoit.monin@gmx.fr>
+
+- update to version 3.7:
+  * Changed
+    + Refactor abbr Extension
+  * Fixed
+    + Fixed links to source code on GitHub from the documentation
+      (#1453).
+- rename source tarball to markdown to match upstream
+
+-------------------------------------------------------------------
+Mon Aug 12 14:47:54 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
+
+- Split the package into multibuild with tests separate (to
+  separate PyYAML dependency).
+
 -------------------------------------------------------------------
 Fri Mar 15 19:46:03 UTC 2024 - Benoît Monin <benoit.monin@gmx.fr>
 

python-Markdown.spec

@@ -1,7 +1,8 @@
 #
 # spec file for package python-Markdown
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,30 +17,53 @@
 #
 
 
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
+%bcond_without test
+%endif
+%if "%{flavor}" == ""
+%define psuffix %{nil}
+%bcond_with test
+%endif
+%if 0%{?suse_version} > 1500
+%bcond_without libalternatives
+%else
+%bcond_with libalternatives
+%endif
 %{?sle15_python_module_pythons}
-Name:           python-Markdown
-Version:        3.6
+Name:           python-Markdown%{psuffix}
+Version:        3.8.2
 Release:        0
 Summary:        Python implementation of Markdown
 License:        BSD-3-Clause
 Group:          Development/Languages/Python
 URL:            https://python-markdown.github.io/
-Source:         https://files.pythonhosted.org/packages/source/M/Markdown/Markdown-%{version}.tar.gz
+Source:         https://files.pythonhosted.org/packages/source/m/markdown/markdown-%{version}.tar.gz
 Patch0:         markdown-3.0-python37.patch
-BuildRequires:  %{python_module PyYAML}
+# PATCH-FIX-UPSTREAM fix-py314.patch gh#Python-Markdown/markdown#1547 mcepl@suse.com
+# Fix failing cases for Python 3.14
+Patch1:         fix-py314.patch
 BuildRequires:  %{python_module base >= 3.8}
 BuildRequires:  %{python_module importlib-metadata >= 4.4 if %python-base < 3.10}
 BuildRequires:  %{python_module pip}
-BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module setuptools >= 77.0}
 BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-%if 0%{?python_version_nodots} < 310
-Requires:       python-importlib-metadata >= 4.4
-%endif
+Requires:       (python-importlib-metadata >= 4.4 if python-base < 3.10)
+BuildArch:      noarch
+%if %{with libalternatives}
+BuildRequires:  alts
+Requires:       alts
+%else
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
-BuildArch:      noarch
+%endif
+%if %{with test}
+BuildRequires:  %{python_module Markdown = %{version}}
+BuildRequires:  %{python_module PyYAML}
+%endif
 %python_subpackages
 
 %description
@@ -50,31 +74,42 @@ on what exactly is supported and what is not. Additional features are
 supported by the [Available Extensions][].
 
 %prep
-%autosetup -p1 -n Markdown-%{version}
+%autosetup -p1 -n markdown-%{version}
 
 %build
+%if %{without test}
 %pyproject_wheel
+%endif
 
 %install
+%if %{without test}
 %pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %python_clone -a %{buildroot}%{_bindir}/markdown_py
+%endif
 
 %check
+%if %{with test}
 %pyunittest discover -v
+%endif
 
+%if %{without test}
 %post
 %python_install_alternative markdown_py
 
 %postun
 %python_uninstall_alternative markdown_py
 
+%pre
+%python_libalternatives_reset_alternative markdown_py
+
 %files %{python_files}
 %license LICENSE.md
 %doc README.md docs/*
 %python_alternative %{_bindir}/markdown_py
-%{python_sitelib}/Markdown-%{version}*-info
 %{python_sitelib}/markdown
+%{python_sitelib}/[mM]arkdown-%{version}.dist-info
+%endif
 
 %changelog