From 70dba8e13760f84db0d34043c4079a6dffef82fc Mon Sep 17 00:00:00 2001
From: Darren Meehan <hi@drn.ie>
Date: Fri, 17 Mar 2023 10:07:50 +0000
Subject: [PATCH] GH-1230 Use find_namespace_packages()

---
 setup.py                                           | 14 ++++++--------
 .../_vendored/pydevd/pydevd_plugins/__init__.py    |  8 --------
 .../pydevd/pydevd_plugins/extensions/__init__.py   |  7 -------
 .../pydevd_plugins/extensions/types/__init__.py    |  7 -------
 .../my_extensions/pydevd_plugins/__init__.py       |  7 -------
 .../pydevd_plugins/extensions/__init__.py          |  7 -------
 6 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 src/debugpy/_vendored/pydevd/pydevd_plugins/__init__.py
 delete mode 100644 src/debugpy/_vendored/pydevd/pydevd_plugins/extensions/__init__.py
 delete mode 100644 src/debugpy/_vendored/pydevd/pydevd_plugins/extensions/types/__init__.py
 delete mode 100644 src/debugpy/_vendored/pydevd/tests_python/my_extensions/pydevd_plugins/__init__.py
 delete mode 100644 src/debugpy/_vendored/pydevd/tests_python/my_extensions/pydevd_plugins/extensions/__init__.py

diff --git a/setup.py b/setup.py
index 482c36bf..4ecb4010 100644
--- a/setup.py
+++ b/setup.py
@@ -176,14 +176,12 @@ if __name__ == "__main__":
             "License :: OSI Approved :: MIT License",
         ],
         package_dir={"": "src"},
-        packages=[
-            "debugpy",
-            "debugpy.adapter",
-            "debugpy.common",
-            "debugpy.launcher",
-            "debugpy.server",
-            "debugpy._vendored",
-        ],
+        packages=setuptools.find_namespace_packages(
+            include=[
+                "debugpy",
+                "debugpy.*",
+            ]
+        ),
         package_data={
             "debugpy": ["ThirdPartyNotices.txt"],
             "debugpy._vendored": [
diff --git a/src/debugpy/_vendored/pydevd/pydevd_plugins/__init__.py b/src/debugpy/_vendored/pydevd/pydevd_plugins/__init__.py
deleted file mode 100644
index f471804c..00000000
--- a/src/debugpy/_vendored/pydevd/pydevd_plugins/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import warnings
-with warnings.catch_warnings():
-    warnings.filterwarnings("ignore", category=DeprecationWarning)
-    try:
-        __import__('pkg_resources').declare_namespace(__name__)
-    except ImportError:
-        import pkgutil
-        __path__ = pkgutil.extend_path(__path__, __name__)
diff --git a/src/debugpy/_vendored/pydevd/pydevd_plugins/extensions/__init__.py b/src/debugpy/_vendored/pydevd/pydevd_plugins/extensions/__init__.py
deleted file mode 100644
index 274d7bc4..00000000
--- a/src/debugpy/_vendored/pydevd/pydevd_plugins/extensions/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import warnings
-with warnings.catch_warnings():
-    try:
-        __import__('pkg_resources').declare_namespace(__name__)
-    except ImportError:
-        import pkgutil
-        __path__ = pkgutil.extend_path(__path__, __name__)
diff --git a/src/debugpy/_vendored/pydevd/pydevd_plugins/extensions/types/__init__.py b/src/debugpy/_vendored/pydevd/pydevd_plugins/extensions/types/__init__.py
deleted file mode 100644
index 274d7bc4..00000000
--- a/src/debugpy/_vendored/pydevd/pydevd_plugins/extensions/types/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import warnings
-with warnings.catch_warnings():
-    try:
-        __import__('pkg_resources').declare_namespace(__name__)
-    except ImportError:
-        import pkgutil
-        __path__ = pkgutil.extend_path(__path__, __name__)
diff --git a/src/debugpy/_vendored/pydevd/tests_python/my_extensions/pydevd_plugins/__init__.py b/src/debugpy/_vendored/pydevd/tests_python/my_extensions/pydevd_plugins/__init__.py
deleted file mode 100644
index 274d7bc4..00000000
--- a/src/debugpy/_vendored/pydevd/tests_python/my_extensions/pydevd_plugins/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import warnings
-with warnings.catch_warnings():
-    try:
-        __import__('pkg_resources').declare_namespace(__name__)
-    except ImportError:
-        import pkgutil
-        __path__ = pkgutil.extend_path(__path__, __name__)
diff --git a/src/debugpy/_vendored/pydevd/tests_python/my_extensions/pydevd_plugins/extensions/__init__.py b/src/debugpy/_vendored/pydevd/tests_python/my_extensions/pydevd_plugins/extensions/__init__.py
deleted file mode 100644
index 274d7bc4..00000000
--- a/src/debugpy/_vendored/pydevd/tests_python/my_extensions/pydevd_plugins/extensions/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import warnings
-with warnings.catch_warnings():
-    try:
-        __import__('pkg_resources').declare_namespace(__name__)
-    except ImportError:
-        import pkgutil
-        __path__ = pkgutil.extend_path(__path__, __name__)