Sync from SUSE:SLFO:Main python-hatch revision 7a17147e0604de70969b8b7d0038baec

This commit is contained in:
2025-06-27 15:39:57 +02:00
parent 409eb1eb04
commit a57643dd1f
5 changed files with 52 additions and 6 deletions

29
click-8.2.patch Normal file
View File

@@ -0,0 +1,29 @@
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

BIN
hatch-v1.14.0.tar.gz (Stored with Git LFS)

Binary file not shown.

BIN
hatch-v1.14.1.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Jun 26 09:36:32 UTC 2025 - Daniel Garcia <daniel.garcia@suse.com>
- Add click-8.2.patch to fix tests with click >= 8.2
gh#pypa/hatch#2013
-------------------------------------------------------------------
Wed Apr 16 07:11:55 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to 1.14.1
* Remove uses of the deprecated --no-python-version-warning
flag when using pip
-------------------------------------------------------------------
Thu Dec 19 17:05:14 UTC 2024 - Nico Krapp <nico.krapp@suse.com>

View File

@@ -1,7 +1,7 @@
#
# spec file for package python-hatch
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,7 @@
%endif
%{?sle15_python_module_pythons}
Name: python-hatch%{psuffix}
Version: 1.14.0
Version: 1.14.1
Release: 0
Summary: Modern, extensible Python project management
License: MIT
@@ -35,6 +35,8 @@ 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
Patch1: click-8.2.patch
BuildRequires: %{python_module base >= 3.8}
BuildRequires: %{python_module hatch-vcs >= 0.3}
BuildRequires: %{python_module hatchling >= 1.26.3}
@@ -128,7 +130,9 @@ donttest+=" or test_uv_env"
donttest+=" or test_pyenv or test_no_open or test_open"
# Fails with hatchling >= 1.26
%pytest -v -k "not ($donttest)"
# Ignore test_build.py it fails because output format difference.
# https://github.com/pypa/hatch/commit/e843c42da2e71468b519a3aacdfeab31b14985a3
%pytest -v -k "not ($donttest)" --ignore tests/cli/build/test_build.py
%endif
%post