From 6cd47e5a495c7c64c58483fc2d05683779abf8e8937187d472cfe6606113ad75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Thu, 23 Nov 2023 13:52:07 +0000 Subject: [PATCH] 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 | 49 ++++++++++++++++++++++++++++++++++++++++++++ python-hatch.changes | 5 +++++ python-hatch.spec | 2 ++ 3 files changed, 56 insertions(+) create mode 100644 packaging232.patch diff --git a/packaging232.patch b/packaging232.patch new file mode 100644 index 0000000..c0d81d7 --- /dev/null +++ b/packaging232.patch @@ -0,0 +1,49 @@ +From 22a4eb02f00f2b332d3199d18ee7f546640564d0 Mon Sep 17 00:00:00 2001 +From: Ofek Lev +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 diff --git a/python-hatch.changes b/python-hatch.changes index 7fb6b51..c745794 100644 --- a/python-hatch.changes +++ b/python-hatch.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 23 10:22:50 UTC 2023 - Markéta Machová + +- Add packaging232.patch to fix tests with recent packaging + ------------------------------------------------------------------- Sat Oct 7 11:16:12 UTC 2023 - Matej Cepl diff --git a/python-hatch.spec b/python-hatch.spec index 83b7ad5..e373c9e 100644 --- a/python-hatch.spec +++ b/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}