pydevd-pycharm 251.17181.23__tar.gz → 251.18673.39__tar.gz

{pydevd_pycharm-251.17181.23/pydevd_pycharm.egg-info → pydevd_pycharm-251.18673.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pydevd-pycharm
-Version: 251.17181.23
+Version: 251.18673.39
 Summary: PyCharm Debugger (used in PyCharm and PyDev)
 Home-page: https://github.com/JetBrains/intellij-community
 Author: JetBrains, Fabio Zadrozny and others

pydevd_pycharm-251.18673.39/VERSION

@@ -0,0 +1 @@
+251.18673.39

{pydevd_pycharm-251.17181.23 → pydevd_pycharm-251.18673.39}/_pydevd_bundle/pydevd_comm.py

@@ -96,7 +96,7 @@ import pydevd_tracing
 from _pydevd_bundle import pydevd_xml
 from _pydevd_bundle import pydevd_vm_type
 from _pydevd_bundle.smart_step_into import find_stepping_variants
-from pydevd_file_utils import get_abs_path_real_path_and_base_from_frame, norm_file_to_client, is_real_file
+from pydevd_file_utils import get_abs_path_real_path_and_base_from_frame, norm_file_to_client, is_real_file, is_jupyter_cell
 import pydevd_file_utils
 import sys
 import traceback
@@ -148,7 +148,7 @@ from _pydevd_bundle.pydevd_comm_constants import (
 MAX_IO_MSG_SIZE = 1000  #if the io is too big, we'll not send all (could make the debugger too non-responsive)
 #this number can be changed if there's need to do so
 
-VERSION_STRING = "251.17181.23"
+VERSION_STRING = "251.18673.39"
 
 from _pydev_bundle._pydev_filesystem_encoding import getfilesystemencoding
 file_system_encoding = getfilesystemencoding()
@@ -733,9 +733,13 @@ class NetCommandFactory:
                         curr_frame = curr_frame.f_back
                         continue
 
-                my_file = abs_path_real_path_and_base[0]
+                is_jup_cell = is_jupyter_cell(curr_frame)
+                if is_jup_cell:
+                    my_file = abs_path_real_path_and_base
+                else:
+                    my_file = abs_path_real_path_and_base[0]
 
-                if is_real_file(my_file):
+                if is_real_file(my_file) and not is_jup_cell:
                     # if filename is Jupyter cell id
                     my_file = pydevd_file_utils.norm_file_to_client(abs_path_real_path_and_base[0])
 

{pydevd_pycharm-251.17181.23 → pydevd_pycharm-251.18673.39}/_pydevd_bundle/pydevd_dont_trace_files.py

@@ -149,6 +149,11 @@ DONT_TRACE = {
     'test_pydev_numpy_without_pandas.py': PYDEV_FILE,
     'test_pydev_pandas.py': PYDEV_FILE,
     'test_pydev_polars.py': PYDEV_FILE,
+    'test_pydev_tensorflow_with_pandas.py': PYDEV_FILE,
+    'test_pydev_torch_with_pandas.py': PYDEV_FILE,
+    'test_pydev_tensorflow_without_pandas.py': PYDEV_FILE,
+    'test_pydev_torch_without_pandas.py': PYDEV_FILE,
+    'test_pydev_dataset.py': PYDEV_FILE,
 }
 
 DONT_TRACE['pydev_jupyter_plugin.py'] = PYDEV_FILE

{pydevd_pycharm-251.17181.23 → pydevd_pycharm-251.18673.39}/_pydevd_bundle/pydevd_process_net_command.py

@@ -367,13 +367,13 @@ def process_net_command(py_db, cmd_id, seq, text):
                 if py_db._set_breakpoints_with_id:
                     try:
                         try:
-                            breakpoint_id, type, file, line, func_name, condition, expression, hit_condition, is_logpoint, suspend_policy = text.split('\t', 9)
+                            breakpoint_id, breakpoint_type, file, line, func_name, condition, expression, hit_condition, is_logpoint, suspend_policy = text.split('\t', 9)
                         except ValueError: # not enough values to unpack
                             # No suspend_policy passed (use default).
-                            breakpoint_id, type, file, line, func_name, condition, expression, hit_condition, is_logpoint = text.split('\t', 8)
+                            breakpoint_id, breakpoint_type, file, line, func_name, condition, expression, hit_condition, is_logpoint = text.split('\t', 8)
                         is_logpoint = is_logpoint == 'True'
                     except ValueError: # not enough values to unpack
-                        breakpoint_id, type, file, line, func_name, condition, expression = text.split('\t', 6)
+                        breakpoint_id, breakpoint_type, file, line, func_name, condition, expression = text.split('\t', 6)
 
                     breakpoint_id = int(breakpoint_id)
                     line = int(line)
@@ -388,7 +388,7 @@ def process_net_command(py_db, cmd_id, seq, text):
                 else:
                     # Note: this else should be removed after PyCharm migrates to setting
                     # breakpoints by id (and ideally also provides func_name).
-                    type, file, line, func_name, suspend_policy, condition, expression = text.split('\t', 6)
+                    breakpoint_type, file, line, func_name, suspend_policy, condition, expression = text.split('\t', 6)
                     # If we don't have an id given for each breakpoint, consider
                     # the id to be the line.
                     breakpoint_id = line = int(line)
@@ -402,7 +402,7 @@ def process_net_command(py_db, cmd_id, seq, text):
                 if not IS_PY3K:  # In Python 3, the frame object will have unicode for the file, whereas on python 2 it has a byte-array encoded with the filesystem encoding.
                     file = file.encode(file_system_encoding)
 
-                if pydevd_file_utils.is_real_file(file):
+                if pydevd_file_utils.is_real_file(file) and breakpoint_type != 'jupyter-line':
                     file = pydevd_file_utils.norm_file_to_server(file)
 
                     if not pydevd_file_utils.exists(file):
@@ -419,7 +419,7 @@ def process_net_command(py_db, cmd_id, seq, text):
                 if hit_condition is not None and (len(hit_condition) <= 0 or hit_condition == "None"):
                     hit_condition = None
 
-                if type == 'python-line':
+                if breakpoint_type == 'python-line':
                     breakpoint = LineBreakpoint(line, condition, func_name, expression, suspend_policy, hit_condition=hit_condition, is_logpoint=is_logpoint)
                     breakpoints = py_db.breakpoints
                     file_to_id_to_breakpoint = py_db.file_to_id_to_line_breakpoint
@@ -428,7 +428,7 @@ def process_net_command(py_db, cmd_id, seq, text):
                     result = None
                     plugin = py_db.get_plugin_lazy_init()
                     if plugin is not None:
-                        result = plugin.add_breakpoint('add_line_breakpoint', py_db, type, file, line, condition, expression, func_name, hit_condition=hit_condition, is_logpoint=is_logpoint)
+                        result = plugin.add_breakpoint('add_line_breakpoint', py_db, breakpoint_type, file, line, condition, expression, func_name, hit_condition=hit_condition, is_logpoint=is_logpoint)
                     if result is not None:
                         supported_type = True
                         breakpoint, breakpoints = result
@@ -437,10 +437,10 @@ def process_net_command(py_db, cmd_id, seq, text):
                         supported_type = False
 
                 if not supported_type:
-                    if type == 'jupyter-line':
+                    if breakpoint_type == 'jupyter-line':
                         return
                     else:
-                        raise NameError(type)
+                        raise NameError(breakpoint_type)
 
                 if DebugInfoHolder.DEBUG_TRACE_BREAKPOINTS > 0:
                     pydev_log.debug('Added breakpoint:%s - line:%s - func_name:%s\n' % (file, line, func_name.encode('utf-8')))
@@ -466,13 +466,13 @@ def process_net_command(py_db, cmd_id, seq, text):
 
             elif cmd_id == CMD_REMOVE_BREAK:
                 #command to remove some breakpoint
-                #text is type\file\tid. Remove from breakpoints dictionary
+                #text is breakpoint_type\file\tid. Remove from breakpoints dictionary
                 breakpoint_type, file, breakpoint_id = text.split('\t', 2)
 
                 if not IS_PY3K:  # In Python 3, the frame object will have unicode for the file, whereas on python 2 it has a byte-array encoded with the filesystem encoding.
                     file = file.encode(file_system_encoding)
 
-                if pydevd_file_utils.is_real_file(file):
+                if pydevd_file_utils.is_real_file(file) and breakpoint_type != 'jupyter-line':
                     file = pydevd_file_utils.norm_file_to_server(file)
 
                 try:

pydevd_pycharm-251.18673.39/ci-requirements.txt

@@ -0,0 +1,21 @@
+# Python 2 compatible requirements to install `tox` on CI so we can execute debugger tests
+appdirs==1.4.3
+configparser==4.0.2
+contextlib2==0.6.0.post1
+distlib==0.3.0
+filelock==3.0.12
+importlib-metadata==1.6.0
+importlib-resources==1.4.0
+packaging==20.9
+pathlib2==2.3.5
+pluggy==0.13.1
+py==1.11.0
+pyparsing==2.4.7
+scandir==1.10.0
+singledispatch==3.4.0.3
+six==1.14.0
+toml==0.10.2
+tox==3.28.0
+typing==3.7.4.1
+virtualenv==20.0.18
+zipp==1.2.0

{pydevd_pycharm-251.17181.23 → pydevd_pycharm-251.18673.39}/pydevd_file_utils.py

@@ -553,10 +553,16 @@ def _is_int(filename):
     except:
         return False
 
+
 def is_real_file(filename):
     # Check for Jupyter cells
     return not _is_int(filename) and not filename.startswith("<ipython-input")
 
+
+def is_jupyter_cell(frame):
+    return frame.f_code.co_name == '<ipython cell>'
+
+
 # For given file f returns tuple of its absolute path, real path and base name
 def get_abs_path_real_path_and_base_from_file(f):
     try:
@@ -587,6 +593,11 @@ def get_abs_path_real_path_and_base_from_frame(frame):
     except:
         # This one is just internal (so, does not need any kind of client-server translation)
         f = frame.f_code.co_filename
+
+        if is_jupyter_cell(frame):
+            NORM_PATHS_AND_BASE_CONTAINER[frame.f_code.co_filename] = f
+            return f
+
         if f is not None and f.startswith (('build/bdist.', 'build\\bdist.')):
             # files from eggs in Python 2.7 have paths like build/bdist.linux-x86_64/egg/<path-inside-egg>
             f = frame.f_globals['__file__']

{pydevd_pycharm-251.17181.23 → pydevd_pycharm-251.18673.39/pydevd_pycharm.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pydevd-pycharm
-Version: 251.17181.23
+Version: 251.18673.39
 Summary: PyCharm Debugger (used in PyCharm and PyDev)
 Home-page: https://github.com/JetBrains/intellij-community
 Author: JetBrains, Fabio Zadrozny and others

{pydevd_pycharm-251.17181.23 → pydevd_pycharm-251.18673.39}/pydevd_pycharm.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ LICENSE
 MANIFEST.in
 README.md
 VERSION
+ci-requirements.txt
 merge_pydev_pycharm.txt
 pycharm-console.rst
 pycharm-readme.rst

pydevd_pycharm-251.17181.23/VERSION

@@ -1 +0,0 @@
-251.17181.23