From 73b436a6a21fc4580d9993967fa774b60c6633d39974a5cfd1b39380dc1733a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Tue, 19 Sep 2023 11:18:19 +0000 Subject: [PATCH] Accepting request 1112235 from home:mcalabkova:branches:devel:languages:python - Add CI.patch to fix tests OBS-URL: https://build.opensuse.org/request/show/1112235 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-hatch?expand=0&rev=22 --- CI.patch | 30 ++++++++++++++++++++++++++++++ python-hatch.changes | 5 +++++ python-hatch.spec | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 CI.patch diff --git a/CI.patch b/CI.patch new file mode 100644 index 0000000..5114b0e --- /dev/null +++ b/CI.patch @@ -0,0 +1,30 @@ +From 4ddbf0a9a720caed18d19c083ff88427c9d2a993 Mon Sep 17 00:00:00 2001 +From: Maximilian Hils +Date: Thu, 24 Aug 2023 05:30:00 +0200 +Subject: [PATCH] Fix CI (#940) + +fix unrelated ci issue +--- + tests/cli/config/test_set.py | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/tests/cli/config/test_set.py b/tests/cli/config/test_set.py +index 73bb9bc03..cd576feb4 100644 +--- a/tests/cli/config/test_set.py ++++ b/tests/cli/config/test_set.py +@@ -184,7 +184,6 @@ def test_project_location_basic_set_first_project(hatch, config_file, helpers, t + f""" + New setting: + project = "foo" +- + [projects] + foo = "{path}" + """ +@@ -206,7 +205,6 @@ def test_project_location_complex_set_first_project(hatch, config_file, helpers, + f""" + New setting: + project = "foo" +- + [projects.foo] + location = "{path}" + """ diff --git a/python-hatch.changes b/python-hatch.changes index d4691d3..524c766 100644 --- a/python-hatch.changes +++ b/python-hatch.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 19 11:01:55 UTC 2023 - Markéta Machová + +- Add CI.patch to fix tests + ------------------------------------------------------------------- Wed Jun 21 08:39:40 UTC 2023 - Ben Greiner diff --git a/python-hatch.spec b/python-hatch.spec index 32316e5..cc7441e 100644 --- a/python-hatch.spec +++ b/python-hatch.spec @@ -37,6 +37,8 @@ Source: https://github.com/pypa/hatch/archive/refs/tags/hatch-v%{version Patch0: fix-sdist-target.patch # PATCH-FIX-UPSTREAM hatch-pr828-pth-tests.patch, gh#pypa/hatch#828 Patch1: hatch-pr828-pth-tests.patch +# PATCH-FIX-UPSTREAM CI.patch, gh#pypa/hatch#940 +Patch2: CI.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module hatchling >= 1.14} BuildRequires: %{python_module pip}