From 53e58f67a36eeaf05f469e830b94b01cb793e8c7 Mon Sep 17 00:00:00 2001
From: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
Date: Thu, 16 Jan 2025 19:59:19 +0000
Subject: [PATCH 1/2] update setup.py/cfg py3

delete deprecated :
bdist_wheel
tests_require
test_suite

use find_namespace_package to prevent warning about 'importable package'
use of namespace because 'ui' is not a pkg as it does not contain __ini__.py
---
 setup.cfg |  2 +-
 setup.py  | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index e2b933446..73a21e204 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,4 +2,4 @@
 zip_ok = false
 
 [bdist_wheel]
-universal = 1
+universal = 0
diff --git a/setup.py b/setup.py
index e13ac5d92..f5908f7af 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@
             " dependency because pkg_resources is used to load plugins"
             )
 
-from setuptools import setup, find_packages
+from setuptools import setup, find_namespace_packages
 here = os.path.abspath(os.path.dirname(__file__))
 try:
     with open(os.path.join(here, 'README.rst'), 'r') as f:
@@ -93,7 +93,13 @@
     classifiers=CLASSIFIERS,
     author="Chris McDonough",
     author_email="chrism@plope.com",
-    packages=find_packages(),
+    packages=find_namespace_packages(exclude=["docs","supervisor.tests","supervisor.tests.*"]),
+    package_dir={"": "."},
+    package_data={
+        "supervisor": ["version.txt"],
+        "supervisor.ui": ["**/*"],
+        "supervisor.skel": ["*"]
+    },
     install_requires=[],
     extras_require={
         'test': ['pytest', 'pytest-cov']

From 5d1267d75cb08d312c925e4ff60e8bba97226c80 Mon Sep 17 00:00:00 2001
From: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
Date: Fri, 17 Jan 2025 13:37:36 +0000
Subject: [PATCH 2/2] update setup.py compat with py2.7

without find_{,namespace_}packages
without warnings
use MANIFEST.in
---
 setup.py | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/setup.py b/setup.py
index f5908f7af..29eec539e 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@
             " dependency because pkg_resources is used to load plugins"
             )
 
-from setuptools import setup, find_namespace_packages
+from setuptools import setup
 here = os.path.abspath(os.path.dirname(__file__))
 try:
     with open(os.path.join(here, 'README.rst'), 'r') as f:
@@ -93,13 +93,18 @@
     classifiers=CLASSIFIERS,
     author="Chris McDonough",
     author_email="chrism@plope.com",
-    packages=find_namespace_packages(exclude=["docs","supervisor.tests","supervisor.tests.*"]),
-    package_dir={"": "."},
-    package_data={
-        "supervisor": ["version.txt"],
-        "supervisor.ui": ["**/*"],
-        "supervisor.skel": ["*"]
-    },
+    packages=[
+        'supervisor',
+        'supervisor.medusa',
+        'supervisor.scripts',
+        'supervisor.skel',
+        'supervisor.tests',
+        'supervisor.tests.fixtures',
+        'supervisor.tests.fixtures.example',
+        'supervisor.ui',
+        'supervisor.ui.images',
+        'supervisor.ui.stylesheets',
+    ],
     install_requires=[],
     extras_require={
         'test': ['pytest', 'pytest-cov']