From b911acf57c981316f0a13401e1e1d7cb0304dec0 Mon Sep 17 00:00:00 2001
From: dgarcia <>
Date: Fri, 17 Mar 2023 16:01:11 +0000
Subject: [PATCH] Update python-debugpy to version 1.6.6 / rev 9 via SR 1072342

https://build.opensuse.org/request/show/1072342
by user dgarcia + dimstar_suse
- Add setuptools-67.3.0.patch to fix test issues with new setuptools.
  gh#microsoft/debugpy#1230
---
 packages/p/python-debugpy/.files              | Bin 235 -> 296 bytes
 packages/p/python-debugpy/.rev                |  10 ++++++++
 .../p/python-debugpy/python-debugpy.changes   |   6 +++++
 packages/p/python-debugpy/python-debugpy.spec |   2 ++
 .../p/python-debugpy/setuptools-67.3.0.patch  |  24 ++++++++++++++++++
 5 files changed, 42 insertions(+)
 create mode 100644 packages/p/python-debugpy/setuptools-67.3.0.patch

diff --git a/packages/p/python-debugpy/.files b/packages/p/python-debugpy/.files
index 1c088db6805c9a5931d79aaf5c94f65ba7754431..bdd104349c2bb8ca67c023d90d57ebb4f65db1f7 100644
GIT binary patch
delta 176
zcmWN~u?@m75CFgcq6sAh4FwA%yx*}umRRQPyonGZmf{o{BO6dM1RJpg=})@f=CggI
zF~h#x6-BWxFT^gg)~ZGJ!7v6etc(fVDsGgcRh>r3Q_92e94kw;uAxqxLtkE^P(&9T
z0=8s00vRWrh!$fTX1%=6WFvb4BrDh<d4^yRS`g(sXe{V8IHo!G!>j7VPxmy}W0J5O
IZp-)j2Tisy+W-In

delta 115
zcmZ3%^qP^opt!_<m5Z5yfq`Y>UYkg>v_vx_a|6>fqr@~zizGuc(_|wfQ<Kyb3sWNt
zLt|s0I^lxKl8pR3-IUa%()5B#z2bt@WG)301M^gKi$rsv^0Xu~6Qk55vt)}TW0ORS
RWJ5zUlaz^BG82F50{{sbAiMwo

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 @@
     <comment>- skip more tests for python 3.11</comment>
     <requestid>1062640</requestid>
   </revision>
+  <revision rev="9" vrev="3">
+    <srcmd5>cea2526a45c7f66d7ec875cd412f7fb2</srcmd5>
+    <version>1.6.6</version>
+    <time>1679068870</time>
+    <user>dimstar_suse</user>
+    <comment>- Add setuptools-67.3.0.patch to fix test issues with new setuptools.
+  gh#microsoft/debugpy#1230
+</comment>
+    <requestid>1072342</requestid>
+  </revision>
 </revisionlist>
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 <daniel.garcia@suse.com>
+
+- 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 <dmueller@suse.com>
 
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 <pminaev@microsoft.com>
+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)