Accepting request 1128299 from home:mcalabkova:branches:devel:languages:python

- Add packaging232.patch to fix tests with recent packaging

OBS-URL: https://build.opensuse.org/request/show/1128299
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-hatch?expand=0&rev=26

packaging232.patch

@@ -0,0 +1,49 @@
+From 22a4eb02f00f2b332d3199d18ee7f546640564d0 Mon Sep 17 00:00:00 2001
+From: Ofek Lev <ofekmeister@gmail.com>
+Date: Sat, 7 Oct 2023 20:04:32 -0400
+Subject: [PATCH] Fix tests
+
+---
+ tests/cli/env/test_show.py          | 18 +++++++++---------
+ tests/index/server/devpi/Dockerfile |  2 +-
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/tests/cli/env/test_show.py b/tests/cli/env/test_show.py
+index 3588ce243..9cc2f42a2 100644
+--- a/tests/cli/env/test_show.py
++++ b/tests/cli/env/test_show.py
+@@ -439,15 +439,15 @@ def test_context_formatting(hatch, helpers, temp_dir, config_file):
+         +======+=========+==============+=======================+
+         | foo  | virtual | pydantic     | BAR=FOO_BAR           |
+         +------+---------+--------------+-----------------------+
+-                                  Matrices
+-        +---------+---------+------------+-------------------------+
+-        | Name    | Type    | Envs       | Dependencies            |
+-        +=========+=========+============+=========================+
+-        | default | virtual | py39-9000  | foo @ {root:uri}/../foo |
+-        |         |         | py39-3.14  |                         |
+-        |         |         | py310-9000 |                         |
+-        |         |         | py310-3.14 |                         |
+-        +---------+---------+------------+-------------------------+
++                                 Matrices
++        +---------+---------+------------+------------------------+
++        | Name    | Type    | Envs       | Dependencies           |
++        +=========+=========+============+========================+
++        | default | virtual | py39-9000  | foo@ {root:uri}/../foo |
++        |         |         | py39-3.14  |                        |
++        |         |         | py310-9000 |                        |
++        |         |         | py310-3.14 |                        |
++        +---------+---------+------------+------------------------+
+         """
+     )
+ 
+diff --git a/tests/index/server/devpi/Dockerfile b/tests/index/server/devpi/Dockerfile
+index d00434f84..01d4c0ddd 100644
+--- a/tests/index/server/devpi/Dockerfile
++++ b/tests/index/server/devpi/Dockerfile
+@@ -1,4 +1,4 @@
+-FROM python:alpine
++FROM python:3.11-alpine
+ 
+ RUN apk add --update build-base && \
+     pip install -U devpi-server devpi-client devpi-web

python-hatch.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Nov 23 10:22:50 UTC 2023 - Markéta Machová <mmachova@suse.com>
+
+- Add packaging232.patch to fix tests with recent packaging
+
 -------------------------------------------------------------------
 Sat Oct  7 11:16:12 UTC 2023 - Matej Cepl <mcepl@cepl.eu>
 

python-hatch.spec

@@ -39,6 +39,8 @@ Patch0:         fix-sdist-target.patch
 Patch1:         hatch-pr828-pth-tests.patch
 # PATCH-FIX-UPSTREAM CI.patch, gh#pypa/hatch#940
 Patch2:         CI.patch
+# PATCH-FIX-UPSTREAM packaging232.patch gh#pypa/hatch#989
+Patch3:         packaging232.patch
 BuildRequires:  %{python_module base >= 3.7}
 BuildRequires:  %{python_module hatchling >= 1.14}
 BuildRequires:  %{python_module pip}