From ddd017329ae952619a3d50d0faabd701f260881b Mon Sep 17 00:00:00 2001 From: Nicolas PARLANT Date: Thu, 16 Jan 2025 19:59:19 +0000 Subject: [PATCH] Update setup.py/cfg delete deprecated : bdist_wheel tests_require test_suite use find_namespace_pacakge 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 | 11 +++++++---- 2 files changed, 8 insertions(+), 5 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 4fc9c2e4e..3c6648176 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ 'pytest-cov', ] -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: @@ -91,15 +91,18 @@ 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.ui": ["**/*"], + "supervisor.skel": ["*"] + }, install_requires=requires, extras_require={ 'testing': testing_extras, }, - tests_require=tests_require, include_package_data=True, zip_safe=False, - test_suite="supervisor.tests", entry_points={ 'console_scripts': [ 'supervisord = supervisor.supervisord:main',