From 05cb9e6e7c86ea51208a669b78f9b938f2818fedd714d99f7d9b564f5c7a78c8 Mon Sep 17 00:00:00 2001 From: Daniel Garcia Date: Thu, 16 Mar 2023 10:53:35 +0000 Subject: [PATCH] - Add setuptools-67.3.0.patch to fix test issues with new setuptools. gh#microsoft/debugpy#1230 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-debugpy?expand=0&rev=17 --- python-debugpy.changes | 6 ++++++ python-debugpy.spec | 2 ++ setuptools-67.3.0.patch | 24 ++++++++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 setuptools-67.3.0.patch diff --git a/python-debugpy.changes b/python-debugpy.changes index c7c7b98..0945393 100644 --- a/python-debugpy.changes +++ b/python-debugpy.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 16 10:39:58 UTC 2023 - Daniel Garcia + +- Add setuptools-67.3.0.patch to fix test issues with new setuptools. + gh#microsoft/debugpy#1230 + ------------------------------------------------------------------- Thu Feb 2 12:58:38 UTC 2023 - Dirk Müller diff --git a/python-debugpy.spec b/python-debugpy.spec index 332ffb3..ea9ee03 100644 --- a/python-debugpy.spec +++ b/python-debugpy.spec @@ -37,6 +37,8 @@ Summary: An implementation of the Debug Adapter Protocol for Python License: MIT URL: https://github.com/microsoft/debugpy/ Source: https://github.com/microsoft/debugpy/archive/v%{version}.tar.gz#/debugpy-%{version}.tar.gz +# PATCH-FIX-UPSTREAM setuptools-67.3.0.patch (gh#microsoft/debugpy#1230, gh#microsoft/debugpy@35504f83ed80) +Patch1: setuptools-67.3.0.patch BuildRequires: %{python_module Cython} BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} diff --git a/setuptools-67.3.0.patch b/setuptools-67.3.0.patch new file mode 100644 index 0000000..92072aa --- /dev/null +++ b/setuptools-67.3.0.patch @@ -0,0 +1,24 @@ +From 35504f83ed807fa9eddcacf940da4e35e7688d78 Mon Sep 17 00:00:00 2001 +From: Pavel Minaev +Date: Tue, 7 Mar 2023 10:34:59 -0800 +Subject: [PATCH] Work around #1230 + +Look for more specific text in the output to avoid false positives. +--- + tests/debugpy/test_run.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +Index: debugpy-1.6.6/tests/debugpy/test_run.py +=================================================================== +--- debugpy-1.6.6.orig/tests/debugpy/test_run.py ++++ debugpy-1.6.6/tests/debugpy/test_run.py +@@ -89,8 +89,7 @@ def test_run_relative_path(pyfile, run): + with open(pydevd_debug_file, "r") as stream: + contents = stream.read() + +- assert "critical" not in contents +- assert "Traceback" not in contents ++ assert "FileNotFound" not in contents + + + @pytest.mark.parametrize("run", runners.all_launch)