Accepting request 1318435 from devel:languages:python

OBS-URL: https://build.opensuse.org/request/show/1318435
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-hatch?expand=0&rev=22

click-8.2.patch

@@ -1,29 +0,0 @@
-From df295583784427214324b974c75901da12931ec1 Mon Sep 17 00:00:00 2001
-From: Daniel Garcia Moreno <daniel.garcia@suse.com>
-Date: Thu, 26 Jun 2025 11:32:54 +0200
-Subject: [PATCH] Fix test_self with click >= 8.2.0
-
-https://click.palletsprojects.com/en/stable/changes/#version-8-2-0
----
- tests/cli/self/test_self.py | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/tests/cli/self/test_self.py b/tests/cli/self/test_self.py
-index cd1a4aed1..f727b87f4 100644
---- a/tests/cli/self/test_self.py
-+++ b/tests/cli/self/test_self.py
-@@ -1,7 +1,13 @@
- import os
-+import importlib
- 
- 
- def test(hatch):
-     result = hatch(os.environ['PYAPP_COMMAND_NAME'])
-+    exit_code = 2
- 
--    assert result.exit_code == 0, result.output
-+    click_version = importlib.metadata.version('click')
-+    if click_version <= '8.1.8':
-+        exit_code = 0
-+
-+    assert result.exit_code == exit_code, result.output

fix-tests.patch

@@ -0,0 +1,40 @@
+From 79d3c156d6d49d277d4a4014e78f84b02aac978b Mon Sep 17 00:00:00 2001
+From: Cary <hawkinscary23@gmail.com>
+Date: Sat, 27 Sep 2025 14:07:34 -0700
+Subject: [PATCH] Fix failing tests, handle subprocess buffering causing output
+ issues on terminal (#2061)
+
+Co-authored-by: Ofek Lev <ofekmeister@gmail.com>
+
+diff --git a/tests/cli/config/test_set.py b/tests/cli/config/test_set.py
+index cd576feb4..73bb9bc03 100644
+--- a/tests/cli/config/test_set.py
++++ b/tests/cli/config/test_set.py
+@@ -184,6 +184,7 @@ def test_project_location_basic_set_first_project(hatch, config_file, helpers, t
+         f"""
+         New setting:
+         project = "foo"
++
+         [projects]
+         foo = "{path}"
+         """
+@@ -205,6 +206,7 @@ def test_project_location_complex_set_first_project(hatch, config_file, helpers,
+         f"""
+         New setting:
+         project = "foo"
++
+         [projects.foo]
+         location = "{path}"
+         """
+diff --git a/tests/cli/self/test_self.py b/tests/cli/self/test_self.py
+index cd1a4aed1..3059905f5 100644
+--- a/tests/cli/self/test_self.py
++++ b/tests/cli/self/test_self.py
+@@ -2,6 +2,6 @@
+ 
+ 
+ def test(hatch):
+-    result = hatch(os.environ['PYAPP_COMMAND_NAME'])
++    result = hatch(os.environ['PYAPP_COMMAND_NAME'], '-h')
+ 
+     assert result.exit_code == 0, result.output

fix-with-latest-hatchling.patch

@@ -3,19 +3,6 @@ From: Ofek Lev <ofekmeister@gmail.com>
 Date: Sat, 9 Nov 2024 11:35:16 -0500
 Subject: [PATCH] Bump `packaging` to 24.2 (#1788)
 
----
- hatch.toml                                  |   4 -
- pyproject.toml                              |   2 +-
- src/hatch/template/default.py               |   2 +-
- tests/backend/licenses/__init__.py          |   0
- tests/backend/licenses/test_parse.py        |  56 --
- tests/backend/licenses/test_supported.py    |  31 -
- tests/backend/metadata/test_core.py         |   2 +-
- 15 files changed, 11 insertions(+), 974 deletions(-)
- delete mode 100644 tests/backend/licenses/__init__.py
- delete mode 100644 tests/backend/licenses/test_parse.py
- delete mode 100644 tests/backend/licenses/test_supported.py
-
 Index: hatch-hatch-v1.14.0/hatch.toml
 ===================================================================
 --- hatch-hatch-v1.14.0.orig/hatch.toml

hatch-v1.15.1.tar.gz

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

python-hatch.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Mon Nov 17 08:20:59 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Update to 1.15.1
+  * Fix compatibility with cached default CPython distributions
+    that were sourced from GitHub releases of the old owner
+
+-------------------------------------------------------------------
+Mon Nov 10 01:24:10 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Use python-uv for Requires, so it explicitly matches the Python version.
+
+-------------------------------------------------------------------
+Thu Oct 16 07:47:48 UTC 2025 - Nico Krapp <nico.krapp@suse.com>
+
+- Update to 1.15.0
+  * Drop support for Python 3.8
+  * Support Python 3.14
+  * Upgrade default CPython distributions to 20251014
+  * Upgrade default PyPy distributions to 7.3.20
+- Update to 1.14.2
+  * Fix compatibility with recent versions of Click
+- drop click-8.2.patch, fixed upstream
+- Add fix-tests.patch to fix tests
+
+-------------------------------------------------------------------
+Thu Aug 21 08:22:26 UTC 2025 - Markéta Machová <mmachova@suse.com>
+
+- Convert to libalternatives on SLE-16-based and newer systems only
+
+-------------------------------------------------------------------
+Thu Jul 10 12:33:57 UTC 2025 - Markéta Machová <mmachova@suse.com>
+
+- Convert to libalternatives
+
 -------------------------------------------------------------------
 Thu Jun 26 09:36:32 UTC 2025 - Daniel Garcia <daniel.garcia@suse.com>
 

python-hatch.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-hatch
 #
-# 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
@@ -24,9 +24,14 @@
 %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-hatch%{psuffix}
-Version:        1.14.1
+Version:        1.15.1
 Release:        0
 Summary:        Modern, extensible Python project management
 License:        MIT
@@ -35,16 +40,14 @@ URL:            https://hatch.pypa.io/latest/
 Source:         https://github.com/pypa/hatch/archive/refs/tags/hatch-v%{version}.tar.gz
 # PATCH-FIX-UPSTREAM fix-with-latest-hatchling.patch gh#f8a2eaa gh#28f233c gh#fc25690
 Patch0:         fix-with-latest-hatchling.patch
-# PATCH-FIX-UPSTREAM click-8.2.patch gh#pypa/hatch#2013
+# PATCH-FIX-UPSTREAM fix-tests.patch gh#79d3c15
-Patch1:         click-8.2.patch
+Patch1:         fix-tests.patch
 BuildRequires:  %{python_module base >= 3.8}
 BuildRequires:  %{python_module hatch-vcs >= 0.3}
 BuildRequires:  %{python_module hatchling >= 1.26.3}
 BuildRequires:  %{python_module pip}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-Requires(post): update-alternatives
-Requires(postun): update-alternatives
 Requires:       git-core
 Requires:       python-click >= 8.0.6
 Requires:       python-hatchling >= 1.21.0
@@ -57,11 +60,18 @@ Requires:       python-rich >= 11.2.0
 Requires:       python-shellingham >= 1.4.0
 Requires:       python-tomli-w >= 1.0
 Requires:       python-tomlkit >= 0.11.1
+Requires:       python-uv >= 0.5.23
 Requires:       python-virtualenv >= 20.16.2
 Requires:       python-zstandard < 1
-Requires:       uv
 Requires:       (python-pexpect >= 4.8 with python-pexpect < 5)
 Requires:       (python-userpath >= 1.7 with python-userpath < 2)
+%if %{with libalternatives}
+BuildRequires:  alts
+Requires:       alts
+%else
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
+%endif
 %if %{with test}
 BuildRequires:  %{python_module editables}
 BuildRequires:  %{python_module filelock >= 3.7.1}
@@ -72,7 +82,6 @@ BuildRequires:  %{python_module pytest-xdist}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module trustme}
 BuildRequires:  cargo
-BuildRequires:  uv
 %else
 BuildArch:      noarch
 %endif
@@ -141,6 +150,9 @@ donttest+=" or test_pyenv or test_no_open or test_open"
 %postun
 %python_uninstall_alternative hatch
 
+%pre
+%python_libalternatives_reset_alternative hatch
+
 %if !%{with test}
 %files %{python_files}
 %doc README.md