From 7715cb62bd54436d62bc934b300f0023409c41a9c157e6f03337a8af6d31f0b0 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 6 May 2023 15:59:34 +0000 Subject: [PATCH] REmove superflous patch. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-build?expand=0&rev=23 --- python-build.spec | 2 -- support-pip-23.patch | 36 ------------------------------------ 2 files changed, 38 deletions(-) delete mode 100644 support-pip-23.patch diff --git a/python-build.spec b/python-build.spec index ca1b7c9..4b9d296 100644 --- a/python-build.spec +++ b/python-build.spec @@ -45,8 +45,6 @@ Patch0: 589-colorized-pip23.patch # PATCH-FIX-UPSTREAM 609-filter-out-malicious.patch gh#pypa/build!609 mcepl@suse.com # With new tarfile filters, there is now new warning Patch1: 609-filter-out-malicious.patch -# # PATCH-FIX-UPSTREAM gh#pypa/build#b52fdbd70550a9ef58e65b3376cec1e9951d2114 -# Patch0: support-pip-23.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module flit-core >= 3.4} BuildRequires: %{python_module pip} diff --git a/support-pip-23.patch b/support-pip-23.patch deleted file mode 100644 index 0089f10..0000000 --- a/support-pip-23.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b52fdbd70550a9ef58e65b3376cec1e9951d2114 Mon Sep 17 00:00:00 2001 -From: Henry Schreiner -Date: Wed, 15 Mar 2023 09:33:53 -0400 -Subject: [PATCH] tests: strip formatting from stderr (pip 23) - -Signed-off-by: Henry Schreiner ---- - tests/test_main.py | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/tests/test_main.py b/tests/test_main.py -index e924d8bd..456ff749 100644 ---- a/tests/test_main.py -+++ b/tests/test_main.py -@@ -20,6 +20,8 @@ - cwd = os.getcwd() - out = os.path.join(cwd, 'dist') - -+ANSI_STRIP = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])') -+ - - @pytest.mark.parametrize( - ('cli_args', 'build_args', 'hook'), -@@ -368,8 +370,10 @@ def test_output_env_subprocess_error( - assert stdout[:4] == stdout_body - assert stdout[-1].startswith(stdout_error) - -- assert len(stderr) == 1 -- assert stderr[0].startswith('ERROR: Invalid requirement: ') -+ # Newer versions of pip also color stderr - strip them if present -+ cleaned_stderr = ANSI_STRIP.sub('', '\n'.join(stderr)).strip() -+ assert len(cleaned_stderr.splitlines()) == 1 -+ assert cleaned_stderr.startswith('ERROR: Invalid requirement: ') - - - @pytest.mark.parametrize(