1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
diff --git a/pyproject.toml b/pyproject.toml
index 9a79e55..8725d19 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,7 +8,6 @@ exclude = '''
( __pycache__
| ^/.tox
| ^/versioneer.py
-| ^/src/debugpy/_vendored
| ^/src/debugpy/_version.py
)
'''
diff --git a/setup.py b/setup.py
index 3abc811..c11924c 100644
--- a/setup.py
+++ b/setup.py
@@ -18,12 +18,10 @@ del sys.path[0]
sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "src"))
import debugpy
-import debugpy._vendored
del sys.path[0]
-PYDEVD_ROOT = debugpy._vendored.project_root("pydevd")
DEBUGBY_ROOT = os.path.dirname(os.path.abspath(debugpy.__file__))
@@ -146,8 +144,6 @@ if __name__ == "__main__":
extras["platforms"] = platforms
cmds = versioneer.get_cmdclass()
- override_build(cmds)
- override_build_py(cmds)
setuptools.setup(
name="debugpy",
@@ -183,14 +179,9 @@ if __name__ == "__main__":
"debugpy.common",
"debugpy.launcher",
"debugpy.server",
- "debugpy._vendored",
],
package_data={
"debugpy": ["ThirdPartyNotices.txt"],
- "debugpy._vendored": [
- # pydevd extensions must be built before this list can be computed properly,
- # so it is populated in the overridden build_py.finalize_options().
- ],
},
ext_modules=ExtModules(),
has_ext_modules=lambda: True,
diff --git a/src/debugpy/server/__init__.py b/src/debugpy/server/__init__.py
index 42d5367..e333dcf 100644
--- a/src/debugpy/server/__init__.py
+++ b/src/debugpy/server/__init__.py
@@ -1,7 +1,3 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See LICENSE in the project root
# for license information.
-
-# "force_pydevd" must be imported first to ensure (via side effects)
-# that the debugpy-vendored copy of pydevd gets used.
-import debugpy._vendored.force_pydevd # noqa
diff --git a/src/debugpy/server/attach_pid_injected.py b/src/debugpy/server/attach_pid_injected.py
index a8df6e1..a29a969 100644
--- a/src/debugpy/server/attach_pid_injected.py
+++ b/src/debugpy/server/attach_pid_injected.py
@@ -31,7 +31,6 @@ def attach(setup):
pydevd_attach_to_process_path = os.path.join(
_debugpy_dir,
"debugpy",
- "_vendored",
"pydevd",
"pydevd_attach_to_process",
)
|
