diff --git a/src/debugpy/_vendored/pydevd/pydevd_tracing.py b/src/debugpy/_vendored/pydevd/pydevd_tracing.py index 5061a533..b1d6d929 100644 --- a/src/debugpy/_vendored/pydevd/pydevd_tracing.py +++ b/src/debugpy/_vendored/pydevd/pydevd_tracing.py @@ -49,7 +49,13 @@ def _internal_set_trace(tracing_func): frame = get_frame() if frame is not None and frame.f_back is not None: filename = frame.f_back.f_code.co_filename.lower() - if not filename.endswith('threading.py') and not filename.endswith('pydevd_tracing.py'): + if not filename.endswith( + ( + 'threading.py', + 'pydevd_tracing.py', + 'threadpool.py', # This is from gevent. + ) + ): message = \ '\nPYDEV DEBUGGER WARNING:' + \ diff --git a/src/debugpy/_vendored/pydevd/tests_python/debugger_fixtures.py b/src/debugpy/_vendored/pydevd/tests_python/debugger_fixtures.py index 2ab0d23e..a6e02d9b 100644 --- a/src/debugpy/_vendored/pydevd/tests_python/debugger_fixtures.py +++ b/src/debugpy/_vendored/pydevd/tests_python/debugger_fixtures.py @@ -487,10 +487,10 @@ def case_setup_django(debugger_runner_simple): version = [int(x) for x in django.get_version().split('.')][:2] if version == [1, 7]: django_folder = 'my_django_proj_17' - elif version in ([2, 1], [2, 2], [3, 0], [3, 1], [3, 2], [4, 0]): + elif version in ([2, 1], [2, 2], [3, 0], [3, 1], [3, 2], [4, 0], [4, 1]): django_folder = 'my_django_proj_21' else: - raise AssertionError('Can only check django 1.7, 2.1, 2.2, 3.0, 3.1, 3.2 and 4.0 right now. Found: %s' % (version,)) + raise AssertionError('Can only check django 1.7 -> 4.1 right now. Found: %s' % (version,)) WriterThread.DJANGO_FOLDER = django_folder for key, value in kwargs.items(): diff --git a/src/debugpy/_vendored/pydevd/tests_python/test_debugger_json.py b/src/debugpy/_vendored/pydevd/tests_python/test_debugger_json.py index 829e4bb1..2857eb00 100644 --- a/src/debugpy/_vendored/pydevd/tests_python/test_debugger_json.py +++ b/src/debugpy/_vendored/pydevd/tests_python/test_debugger_json.py @@ -4106,6 +4106,7 @@ def test_gevent_show_paused_greenlets(case_setup, show): @pytest.mark.skipif(not TEST_GEVENT, reason='Gevent not installed.') +@pytest.mark.skipif(sys.platform == 'win32', reason='tput requires Linux.') def test_gevent_subprocess_not_python(case_setup): def get_environ(writer):