From 8df676a4714e980a3b6163958fe920cf9bb3fd25 Mon Sep 17 00:00:00 2001
From: Carlos Cordoba <ccordoba12@gmail.com>
Date: Sun, 30 May 2021 21:21:59 -0500
Subject: [PATCH 1/3] Testing: Remove installation of IPython 7.23

---
 .github/scripts/install.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/scripts/install.sh b/.github/scripts/install.sh
index 264aec18229..961593fb101 100755
--- a/.github/scripts/install.sh
+++ b/.github/scripts/install.sh
@@ -55,9 +55,6 @@ else
 
     # Provisional change to prevent error from jupyter_client 6.1.13
     pip install jupyter_client==6.1.12
-
-    # Install IPython 7.23 until 7.24.1 is released
-    pip install ipython==7.23.1
 fi
 
 # This is necessary only for Windows (don't know why).

From 20448ca1b35b47bdc5f6c4b3e305d0c23ef55403 Mon Sep 17 00:00:00 2001
From: Carlos Cordoba <ccordoba12@gmail.com>
Date: Wed, 2 Jun 2021 18:48:23 -0500
Subject: [PATCH 2/3] git subrepo clone --branch=fix-debugger --force
 https://github.com/ccordoba12/spyder-kernels.git external-deps/spyder-kernels

subrepo:
  subdir:   "external-deps/spyder-kernels"
  merged:   "b0caff831"
upstream:
  origin:   "https://github.com/ccordoba12/spyder-kernels.git"
  branch:   "fix-debugger"
  commit:   "b0caff831"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
---
 external-deps/spyder-kernels/.gitrepo                       | 6 +++---
 .../spyder-kernels/spyder_kernels/customize/spyderpdb.py    | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/external-deps/spyder-kernels/.gitrepo b/external-deps/spyder-kernels/.gitrepo
index 0c47e9681d9..f29ec87ab3a 100644
--- a/external-deps/spyder-kernels/.gitrepo
+++ b/external-deps/spyder-kernels/.gitrepo
@@ -5,8 +5,8 @@
 ;
 [subrepo]
 	remote = https://github.com/spyder-ide/spyder-kernels.git
-	branch = 2.x
-	commit = 2e44b22eb0d0329c4891ebcb2659fc612cdd27b3
-	parent = 81520b7e746eb42eb6e168ddc97c0f21fa9955ac
+	branch = fix-debugger
+	commit = b0caff831b9a561d25d8df1fef35b0c6b8588b9e
+	parent = 8df676a4714e980a3b6163958fe920cf9bb3fd25
 	method = merge
 	cmdver = 0.4.3
diff --git a/external-deps/spyder-kernels/spyder_kernels/customize/spyderpdb.py b/external-deps/spyder-kernels/spyder_kernels/customize/spyderpdb.py
index 1640be4341f..36b02f3fe05 100755
--- a/external-deps/spyder-kernels/spyder_kernels/customize/spyderpdb.py
+++ b/external-deps/spyder-kernels/spyder_kernels/customize/spyderpdb.py
@@ -15,8 +15,8 @@
 from collections import namedtuple
 
 from IPython.core.autocall import ZMQExitAutocall
-from IPython.core.getipython import get_ipython
 from IPython.core.debugger import Pdb as ipyPdb
+from IPython.core.getipython import get_ipython
 
 from spyder_kernels.comms.frontendcomm import CommError, frontend_request
 from spyder_kernels.customize.utils import path_is_library
@@ -92,6 +92,10 @@ def __init__(self, completekey='tab', stdin=None, stdout=None,
         self._pdb_breaking = False
         self._frontend_notified = False
 
+        # Don't report hidden frames for IPython 7.24+. This attribute
+        # has no effect in previous versions.
+        self.report_skipped = False
+
     # --- Methods overriden for code execution
     def print_exclamation_warning(self):
         """Print pdb warning for exclamation mark."""

From 754f1f34877207ca5742cf46892d89464b2cffa5 Mon Sep 17 00:00:00 2001
From: Carlos Cordoba <ccordoba12@gmail.com>
Date: Wed, 2 Jun 2021 20:09:23 -0500
Subject: [PATCH 3/3] git subrepo clone (merge) --branch=2.x --force
 https://github.com/spyder-ide/spyder-kernels.git external-deps/spyder-kernels

subrepo:
  subdir:   "external-deps/spyder-kernels"
  merged:   "388c6fe33"
upstream:
  origin:   "https://github.com/spyder-ide/spyder-kernels.git"
  branch:   "2.x"
  commit:   "388c6fe33"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
---
 external-deps/spyder-kernels/.gitrepo | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/external-deps/spyder-kernels/.gitrepo b/external-deps/spyder-kernels/.gitrepo
index f29ec87ab3a..a7736de43da 100644
--- a/external-deps/spyder-kernels/.gitrepo
+++ b/external-deps/spyder-kernels/.gitrepo
@@ -5,8 +5,8 @@
 ;
 [subrepo]
 	remote = https://github.com/spyder-ide/spyder-kernels.git
-	branch = fix-debugger
-	commit = b0caff831b9a561d25d8df1fef35b0c6b8588b9e
-	parent = 8df676a4714e980a3b6163958fe920cf9bb3fd25
+	branch = 2.x
+	commit = 388c6fe33e53f7ef89c1032ce5ab502b6768d34c
+	parent = 20448ca1b35b47bdc5f6c4b3e305d0c23ef55403
 	method = merge
 	cmdver = 0.4.3