Skip to content

Commit

Permalink
Merge branch 'magics_runfile' into improve_namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
Quentin Peter committed Mar 31, 2023
2 parents 0fe4899 + 2cb59ce commit c7bdba2
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion requirements/posix.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cloudpickle
ipykernel>=6.16.1,<7
ipython>=7.31.1,<9
jupyter_client>=7.4.9,<8
jupyter_client>=7.4.9,<9
pyzmq>=22.1.0
wurlitzer>=1.0.3
pyxdg>=0.26
2 changes: 1 addition & 1 deletion requirements/windows.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cloudpickle
ipykernel>=6.16.1,<7
ipython>=7.31.1,<9
jupyter_client>=7.4.9,<8
jupyter_client>=7.4.9,<9
pyzmq>=22.1.0
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ def get_version(module='spyder_kernels'):
'cloudpickle',
'ipykernel>=6.16.1,<7',
'ipython>=7.31.1,<9,!=8.8.0,!=8.9.0,!=8.10.0',
'jupyter-client>=7.4.9,<8',
'packaging',
'jupyter-client>=7.4.9,<9',
'pyzmq>=22.1.0',
'wurlitzer>=1.0.3;platform_system!="Windows"',
'pyxdg>=0.26;platform_system=="Linux"',
Expand Down
1 change: 0 additions & 1 deletion spyder_kernels/console/start.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import site

# Third-party imports
from packaging.version import parse
from traitlets import DottedObjectName

# Local imports
Expand Down
4 changes: 2 additions & 2 deletions spyder_kernels/customize/spyderpdb.py
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ def do_debug(self, arg):
executed in the current environment).
"""
with self.recursive_debugger() as debugger:
self.message("ENTERING RECURSIVE DEBUGGER")
self.message("Entering recursive debugger")
try:
globals = self.curframe.f_globals
locals = self.curframe_locals
Expand All @@ -615,7 +615,7 @@ def do_debug(self, arg):
self.error(
traceback.format_exception_only(*exc_info)[-1].strip())
finally:
self.message("LEAVING RECURSIVE DEBUGGER")
self.message("Leaving recursive debugger")

@contextmanager
def recursive_debugger(self):
Expand Down

0 comments on commit c7bdba2

Please sign in to comment.