diff --git a/packages/p/python-debugpy/.files b/packages/p/python-debugpy/.files index 1c088db6805..bdd104349c2 100644 Binary files a/packages/p/python-debugpy/.files and b/packages/p/python-debugpy/.files differ diff --git a/packages/p/python-debugpy/.rev b/packages/p/python-debugpy/.rev index 1af6778b7fe..25e35d0dd05 100644 --- a/packages/p/python-debugpy/.rev +++ b/packages/p/python-debugpy/.rev @@ -70,4 +70,14 @@ - skip more tests for python 3.11 1062640 + + cea2526a45c7f66d7ec875cd412f7fb2 + 1.6.6 + + dimstar_suse + - Add setuptools-67.3.0.patch to fix test issues with new setuptools. + gh#microsoft/debugpy#1230 + + 1072342 + diff --git a/packages/p/python-debugpy/python-debugpy.changes b/packages/p/python-debugpy/python-debugpy.changes index 2fa6797c58f..38aab568d2a 100644 --- a/packages/p/python-debugpy/python-debugpy.changes +++ b/packages/p/python-debugpy/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/packages/p/python-debugpy/python-debugpy.spec b/packages/p/python-debugpy/python-debugpy.spec index e774d8739cf..5cf8fcf592e 100644 --- a/packages/p/python-debugpy/python-debugpy.spec +++ b/packages/p/python-debugpy/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/packages/p/python-debugpy/setuptools-67.3.0.patch b/packages/p/python-debugpy/setuptools-67.3.0.patch new file mode 100644 index 00000000000..390dca2a446 --- /dev/null +++ b/packages/p/python-debugpy/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)