Accepting request 1320260 from devel:languages:python

- Add patch support-pytest-9.patch:
  * Support pytest 9 pyproject changes.

OBS-URL: https://build.opensuse.org/request/show/1320260
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-enrich?expand=0&rev=6

python-enrich-1.3.0.tar.gz

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

python-enrich.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Thu Nov 27 02:50:49 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Add patch support-pytest-9.patch:
+  * Support pytest 9 pyproject changes.
+
+-------------------------------------------------------------------
+Wed Sep 17 15:17:44 UTC 2025 - Sebastian Wagner <sebix@sebix.at>
+
+- Add remove_rich_constraint.patch
+  remove the constraint on rich < 12.5, the tests also succeed with rich 14.0 https://github.com/pycontribs/enrich/issues/40
+-------------------------------------------------------------------
+Mon Sep  8 20:48:59 UTC 2025 - Sebastian Wagner <sebix@sebix.at>
+
+- Update to version 1.3.0:
+  * Require python 3.9 or newer (#67)
+  * Externalize package requirments (#65)
+  * RichHandler add omit_repeated_times parameter (#62)
+  * Adopt PEP-621 (#57)
+  * Move tests outside package (#56)
+  * Remove mock from test dependencies (#46)
+  * Update build-system requirement for setuptools-scm to >=7.0.0 (#45)
+  * Packaging fixes (#48)
+  * Enable support for python 3.11 (#42)
+  * Temporary pin down rich version (#43)
+- Adapt remove_setuptools_scm.patch
+
+-------------------------------------------------------------------
+Mon May 26 12:47:47 UTC 2025 - Markéta Machová <mmachova@suse.com>
+
+- Convert to pip-based build
+
 -------------------------------------------------------------------
 Wed May 10 02:46:11 UTC 2023 - Steve Kowalik <steven.kowalik@suse.com>
 
@@ -10,11 +42,11 @@ Fri May  5 11:56:47 UTC 2023 - Johannes Kastl <kastl@b1-systems.de>
 - add sle15_python_module_pythons
 
 -------------------------------------------------------------------
-Fri Jan 28 16:31:22 UTC 2022 - Sebastian Wagner <sebix+novell.com@sebix.at>
+Fri Jan 28 16:31:22 UTC 2022 - Sebastian Wagner <sebix@sebix.at>
 
 - add remove_setuptools_scm.patch to get rid of setuptools-scm and fix the version
 
 -------------------------------------------------------------------
-Sun Jan 23 11:49:58 UTC 2022 - Sebastian Wagner <sebix+novell.com@sebix.at>
+Sun Jan 23 11:49:58 UTC 2022 - Sebastian Wagner <sebix@sebix.at>
 
 - initial package for version 1.2.7

python-enrich.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-enrich
 #
-# Copyright (c) 2023 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
@@ -17,15 +17,19 @@
 
 
 %{?sle15_python_module_pythons}
-%{?python_enable_dependency_generator}
 Name:           python-enrich
-Version:        1.2.7
+Version:        1.3.0
 Release:        0
 Summary:        Extends the python-rich library functionality
 License:        MIT
 URL:            https://github.com/pycontribs/enrich
-Source:         https://files.pythonhosted.org/packages/source/e/enrich/enrich-%{version}.tar.gz
+Source0:        https://github.com/pycontribs/enrich/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# PATCH-FIX-OPENSUSE remove_setuptools_scm.patch -- remove dependency on setuptools-scm
 Patch0:         remove_setuptools_scm.patch
+# PATCH-FIX-UPSTREAM remove_rich_constraint.patch -- remove the constraint on rich < 12.5, the tests also succeed with rich 14.0 https://github.com/pycontribs/enrich/issues/40
+Patch1:         remove_rich_constraint.patch
+# PATCH-FIX-UPSTREAM gh#pycontribs/enrich#74
+Patch2:         support-pytest-9.patch
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module pytest-mock}
 BuildRequires:  %{python_module pytest}
@@ -35,6 +39,7 @@ BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-rich
 BuildArch:      noarch
+%{?python_enable_dependency_generator}
 %python_subpackages
 
 %description
@@ -42,15 +47,14 @@ Extends the python-rich library functionality
 with a set of changes that were not accepted to rich itself.
 
 %prep
-%autosetup -p1 -n enrich-%{version}
+%autosetup -n enrich-%{version} -p1
-sed -i 's/__VERSION__/%version/' setup.py
+sed -i 's/__VERSION__/%{version}/' pyproject.toml
-sed -i '/_scm/ d' setup.cfg
 
 %build
-%python_build
+%pyproject_wheel
 
 %install
-%python_install
+%pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check

remove_rich_constraint.patch

@@ -0,0 +1,5 @@
+--- a/.config/requirements.in	2024-06-14 14:49:49.000000000 +0200
++++ b/.config/requirements.in	2025-09-17 17:15:41.785371328 +0200
+@@ -1 +1 @@
+-rich>=10.0.0,<12.5.0 # https://github.com/pycontribs/enrich/issues/40
++rich>=10.0.0

remove_setuptools_scm.patch

@@ -1,11 +1,19 @@
---- enrich-1.2.7/setup.py	2022-01-28 17:29:54.476189319 +0100
+--- a/pyproject.toml      2024-06-14 14:49:49.000000000 +0200
-+++ enrich-1.2.7/setup1.py	2022-01-28 17:29:45.739753919 +0100
++++ b/pyproject.toml      2025-09-08 22:56:54.944216329 +0200
-@@ -12,6 +12,6 @@
+@@ -1,14 +1,14 @@
+ [build-system]
+ requires = [
+   "setuptools >= 65.3.0", # required by pyproject+setuptools_scm integration and editable installs
+-  "setuptools_scm[toml] >= 7.0.5", # required for "no-local-version" scheme
+ ]
+ build-backend = "setuptools.build_meta"
  
- if __name__ == "__main__":
+ [project]
-     setuptools.setup(
+ # https://peps.python.org/pep-0621/#readme
--        use_scm_version={"local_scheme": "no-local-version"},
+ requires-python = ">=3.9"
--        setup_requires=["setuptools_scm[toml]>=3.5.0"],
+-dynamic = ["version", "dependencies", "optional-dependencies"]
-+        name='enrich',
++version = "__VERSION__"
-+        version='__VERSION__',
++dynamic = ["dependencies", "optional-dependencies"]
-     )
+ name = "enrich"
+ description = "enrich"
+ readme = "README.md"

support-pytest-9.patch

@@ -0,0 +1,24 @@
+From 5169008811ad2837ab4240bee87e0de7e10036d7 Mon Sep 17 00:00:00 2001
+From: Steve Kowalik <steven@wedontsleep.org>
+Date: Thu, 27 Nov 2025 13:47:48 +1100
+Subject: [PATCH] chore: Support pytest 9
+
+Since pytest 9 now assumes TOML formatting for tool.pytest configuration
+sections, use the ini style for now.
+---
+ pyproject.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 530c296..f99ca04 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -62,7 +62,7 @@ warn_redundant_casts = true
+ warn_return_any = true
+ warn_unused_configs = true
+ 
+-[tool.pytest]
++[tool.pytest.ini_options]
+ addopts = "--doctest-modules --durations 10 --durations-min=3 --color=yes"
+ doctest_optionflags = ["ALLOW_UNICODE", "ELLIPSIS"]
+ norecursedirs = "dist doc build .tox .eggs"