From 2f5f736c2cf82f62752b86b5b16344829051dd7b Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 13 Apr 2023 22:05:03 +0000 Subject: [PATCH] python310Packages.debugpy: 1.6.6 -> 1.6.7 --- pkgs/development/python-modules/debugpy/default.nix | 12 +++--------- .../python-modules/debugpy/fix-test-pythonpath.patch | 4 ++-- .../python-modules/debugpy/hardcode-gdb.patch | 4 ++-- .../python-modules/debugpy/hardcode-lldb.patch | 2 +- .../python-modules/debugpy/hardcode-version.patch | 8 ++++---- 5 files changed, 12 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 69097a585be6..583b8a5d5fd5 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -4,7 +4,6 @@ , pythonOlder , pythonAtLeast , fetchFromGitHub -, fetchpatch , substituteAll , gdb , django @@ -20,7 +19,7 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.6.6"; + version = "1.6.7"; format = "setuptools"; # Currently doesn't support 3.11: @@ -31,7 +30,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "debugpy"; rev = "refs/tags/v${version}"; - hash = "sha256-jEhvpPO3QeKjPiOMxg2xOWitWtZ6UCWyM1WvnbrKnFI="; + hash = "sha256-porQTFvcLaIkvhWPM4vWR0ohlcFRkRwSLpQJNg25Tj4="; }; patches = [ @@ -41,12 +40,6 @@ buildPythonPackage rec { inherit version; }) - # https://github.com/microsoft/debugpy/issues/1230 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/microsoft/debugpy/pull/1232.patch"; - sha256 = "sha256-m5p+xYiJ4w4GcaFIaPmlnErp/7WLwcvJmaCqa2SeSxU="; - }) - # Fix importing debugpy in: # - test_nodebug[module-launch(externalTerminal)] # - test_nodebug[module-launch(integratedTerminal)] @@ -110,6 +103,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "--timeout=0" ]; + # Fixes hanging tests on Darwin __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch b/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch index 0f51106988d9..7cfb1a49ec38 100644 --- a/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch +++ b/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch @@ -1,8 +1,8 @@ diff --git a/tests/debug/session.py b/tests/debug/session.py -index af242877..30b21a1e 100644 +index 7dacc1f9..f303e20a 100644 --- a/tests/debug/session.py +++ b/tests/debug/session.py -@@ -622,6 +622,7 @@ class Session(object): +@@ -631,6 +631,7 @@ class Session(object): if "PYTHONPATH" in self.config.env: # If specified, launcher will use it in lieu of PYTHONPATH it inherited # from the adapter when spawning debuggee, so we need to adjust again. diff --git a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch index ad40a504c9dc..2fe09a70151a 100644 --- a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch +++ b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch @@ -1,8 +1,8 @@ diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -index 462feae9..eb2aa945 100644 +index ed43e370..d3d6669a 100644 --- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -@@ -399,7 +399,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show +@@ -404,7 +404,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show is_debug = 0 # Note that the space in the beginning of each line in the multi-line is important! cmd = [ diff --git a/pkgs/development/python-modules/debugpy/hardcode-lldb.patch b/pkgs/development/python-modules/debugpy/hardcode-lldb.patch index 43ededa083cf..3a1013187351 100644 --- a/pkgs/development/python-modules/debugpy/hardcode-lldb.patch +++ b/pkgs/development/python-modules/debugpy/hardcode-lldb.patch @@ -1,5 +1,5 @@ diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -index ed43e370..b28ab453 100644 +index d3d6669a..2ded8d9c 100644 --- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py @@ -494,7 +494,7 @@ def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_d diff --git a/pkgs/development/python-modules/debugpy/hardcode-version.patch b/pkgs/development/python-modules/debugpy/hardcode-version.patch index 440513e26c1c..11d565b98060 100644 --- a/pkgs/development/python-modules/debugpy/hardcode-version.patch +++ b/pkgs/development/python-modules/debugpy/hardcode-version.patch @@ -1,5 +1,5 @@ diff --git a/setup.py b/setup.py -index 5fc40070..775a08ec 100644 +index 3abc811b..91354604 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,6 @@ import sys @@ -10,7 +10,7 @@ index 5fc40070..775a08ec 100644 del sys.path[0] -@@ -141,13 +140,13 @@ if __name__ == "__main__": +@@ -145,13 +144,13 @@ if __name__ == "__main__": if platforms is not None: extras["platforms"] = platforms @@ -27,7 +27,7 @@ index 5fc40070..775a08ec 100644 long_description=long_description, long_description_content_type="text/markdown", diff --git a/src/debugpy/public_api.py b/src/debugpy/public_api.py -index 3c800898..27743245 100644 +index 9d0f705a..ee0b26ca 100644 --- a/src/debugpy/public_api.py +++ b/src/debugpy/public_api.py @@ -7,8 +7,6 @@ from __future__ import annotations @@ -39,7 +39,7 @@ index 3c800898..27743245 100644 # Expose debugpy.server API from subpackage, but do not actually import it unless # and until a member is invoked - we don't want the server package loaded in the -@@ -182,4 +180,4 @@ def trace_this_thread(__should_trace: bool): +@@ -191,4 +189,4 @@ def trace_this_thread(__should_trace: bool): """