Instead of importing and executing setup directly, split the actual execution to run() functions, then call them from setup(). This is to prepare the script to more changes required to generate a proper source distribution from toplevel setup.py.
Signed-off-by: Lucas Meneghel Rodrigues <[email protected]> --- cli/setup.py | 38 +++++++++++++++++--------------- client/setup.py | 63 ++++++++++++++++++++++++++++-------------------------- database/setup.py | 26 ++++++++++++---------- frontend/setup.py | 48 ++++++++++++++++++++++------------------- mirror/setup.py | 24 ++++++++++++--------- scheduler/setup.py | 30 +++++++++++++++----------- server/setup.py | 34 ++++++++++++++++------------- setup.py | 11 ++++++++++ tko/setup.py | 62 ++++++++++++++++++++++++++++------------------------- utils/setup.py | 42 ++++++++++++++++++++---------------- 10 files changed, 212 insertions(+), 166 deletions(-) diff --git a/cli/setup.py b/cli/setup.py index 5d16c51..b0c3ebd 100644 --- a/cli/setup.py +++ b/cli/setup.py @@ -12,20 +12,24 @@ from autotest.client.shared import version cli_dir = os.path.dirname(sys.modules[__name__].__file__) or '.' autotest_dir = os.path.abspath(os.path.join(cli_dir, "..")) -setup(name='autotest', - description='Autotest framework - cli interface to rpc server', - author='Autotest Team', - author_email='[email protected]', - version=version.get_version(), - url='autotest.kernel.org', - package_dir={'autotest.cli': cli_dir }, - package_data={'autotest.cli' : ['contrib/*' ] }, - packages=['autotest.cli' ], - scripts=[cli_dir + '/autotest-rpc-client', - cli_dir + '/autotest-rpc-change-protection-level', - cli_dir + '/autotest-rpc-compose-query', - cli_dir + '/autotest-rpc-migrate-host', - cli_dir + '/autotest-rpc-query-keyvals', - cli_dir + '/autotest-rpc-query-results', - ], -) +def run(): + setup(name='autotest', + description='Autotest framework - cli interface to rpc server', + author='Autotest Team', + author_email='[email protected]', + version=version.get_version(), + url='autotest.kernel.org', + package_dir={'autotest.cli': cli_dir }, + package_data={'autotest.cli' : ['contrib/*' ] }, + packages=['autotest.cli' ], + scripts=[cli_dir + '/autotest-rpc-client', + cli_dir + '/autotest-rpc-change-protection-level', + cli_dir + '/autotest-rpc-compose-query', + cli_dir + '/autotest-rpc-migrate-host', + cli_dir + '/autotest-rpc-query-keyvals', + cli_dir + '/autotest-rpc-query-results', + ], + ) + +if __name__ == '__main__': + run() diff --git a/client/setup.py b/client/setup.py index 5af92ca..050613e 100644 --- a/client/setup.py +++ b/client/setup.py @@ -28,34 +28,37 @@ pd_filelist.extend(get_data_files(os.path.join(client_dir, 'profilers'))) pd_filelist.extend(get_data_files(os.path.join(client_dir, 'tests'))) pd_filelist.extend(get_data_files(os.path.join(client_dir, 'tools'))) +def run(): + setup(name='autotest', + description='Autotest test framework - local module', + author='Autotest Team', + author_email='[email protected]', + version=version.get_version(), + url='autotest.kernel.org', + package_dir={'autotest.client': client_dir, + 'autotest' : autotest_dir, + }, + package_data={'autotest.client' : pd_filelist }, + packages=['autotest.client.shared', + 'autotest.client.shared.hosts', + 'autotest.client.shared.test_utils', + 'autotest.client.net', + 'autotest.client.tools', + 'autotest.client.profilers', + 'autotest.client.tests', + 'autotest.client.site_tests', + 'autotest.client', + 'autotest', + ], + scripts=[os.path.join(client_dir, 'autotest-local'), + os.path.join(client_dir, 'autotest-local-streamhandler'), + os.path.join(client_dir, 'autotest-daemon'), + os.path.join(client_dir, 'autotest-daemon-monitor')], + data_files=[('/etc/autotest', [autotest_dir + '/global_config.ini', + autotest_dir + '/shadow_config.ini', + ]), + ], + ) -setup(name='autotest', - description='Autotest test framework - local module', - author='Autotest Team', - author_email='[email protected]', - version=version.get_version(), - url='autotest.kernel.org', - package_dir={'autotest.client': client_dir, - 'autotest' : autotest_dir, - }, - package_data={'autotest.client' : pd_filelist }, - packages=['autotest.client.shared', - 'autotest.client.shared.hosts', - 'autotest.client.shared.test_utils', - 'autotest.client.net', - 'autotest.client.tools', - 'autotest.client.profilers', - 'autotest.client.tests', - 'autotest.client.site_tests', - 'autotest.client', - 'autotest', - ], - scripts=[os.path.join(client_dir, 'autotest-local'), - os.path.join(client_dir, 'autotest-local-streamhandler'), - os.path.join(client_dir, 'autotest-daemon'), - os.path.join(client_dir, 'autotest-daemon-monitor')], - data_files=[('/etc/autotest', [autotest_dir + '/global_config.ini', - autotest_dir + '/shadow_config.ini', - ]), - ], -) +if __name__ == '__main__': + run() diff --git a/database/setup.py b/database/setup.py index fc663f9..dbe5fa3 100644 --- a/database/setup.py +++ b/database/setup.py @@ -12,14 +12,18 @@ from autotest.client.shared import version db_dir = os.path.dirname(sys.modules[__name__].__file__) or '.' autotest_dir = os.path.abspath(os.path.join(db_dir, "..")) -setup(name='autotest', - description='Autotest test framework - results database module', - author='Autotest Team', - author_email='[email protected]', - version=version.get_version(), - url='autotest.kernel.org', - package_dir={'autotest.database': db_dir }, - package_data={'autotest.database' : ['*.sql' ] }, - packages=['autotest.database' ], - scripts=[db_dir + '/autotest-upgrade-db'], -) +def run(): + setup(name='autotest', + description='Autotest test framework - results database module', + author='Autotest Team', + author_email='[email protected]', + version=version.get_version(), + url='autotest.kernel.org', + package_dir={'autotest.database': db_dir }, + package_data={'autotest.database' : ['*.sql' ] }, + packages=['autotest.database' ], + scripts=[db_dir + '/autotest-upgrade-db'], + ) + +if __name__ == '__main__': + run() diff --git a/frontend/setup.py b/frontend/setup.py index ab3f631..b89db7d 100644 --- a/frontend/setup.py +++ b/frontend/setup.py @@ -35,25 +35,29 @@ pd_filelist.extend(get_data_files(os.path.join(fe_dir, 'templates'))) pd_filelist.extend(get_data_files(os.path.join(fe_dir, 'tko', 'preconfigs'))) pd_filelist.extend([os.path.join(fe_dir, 'frontend.wsgi')]) -setup(name='autotest', - description='Autotest test framework - rpc server', - author='Autotest Team', - author_email='[email protected]', - version=version.get_version(), - url='autotest.kernel.org', - package_dir={'autotest.frontend': fe_dir }, - package_data={'autotest.frontend' : pd_filelist }, - packages=['autotest.frontend.afe', - 'autotest.frontend.afe.feeds', - 'autotest.frontend.afe.json_rpc', - 'autotest.frontend.db', - 'autotest.frontend.db.backends', - 'autotest.frontend.db.backends.afe', - 'autotest.frontend.db.backends.afe_sqlite', - 'autotest.frontend.migrations', - 'autotest.frontend.shared', - 'autotest.frontend.tko', - 'autotest.frontend', - ], - scripts=[os.path.join(fe_dir, 'autotest-manage-rpc-server')], -) +def run(): + setup(name='autotest', + description='Autotest test framework - rpc server', + author='Autotest Team', + author_email='[email protected]', + version=version.get_version(), + url='autotest.kernel.org', + package_dir={'autotest.frontend': fe_dir }, + package_data={'autotest.frontend' : pd_filelist }, + packages=['autotest.frontend.afe', + 'autotest.frontend.afe.feeds', + 'autotest.frontend.afe.json_rpc', + 'autotest.frontend.db', + 'autotest.frontend.db.backends', + 'autotest.frontend.db.backends.afe', + 'autotest.frontend.db.backends.afe_sqlite', + 'autotest.frontend.migrations', + 'autotest.frontend.shared', + 'autotest.frontend.tko', + 'autotest.frontend', + ], + scripts=[os.path.join(fe_dir, 'autotest-manage-rpc-server')], + ) + +if __name__ == '__main__': + run() diff --git a/mirror/setup.py b/mirror/setup.py index 8676349..f21c197 100644 --- a/mirror/setup.py +++ b/mirror/setup.py @@ -12,13 +12,17 @@ from autotest.client.shared import version mirror_dir = os.path.dirname(sys.modules[__name__].__file__) or '.' autotest_dir = os.path.abspath(os.path.join(mirror_dir, "..")) -setup(name='autotest', - description='Autotest testing framework - mirror module', - author='Autotest Team', - author_email='[email protected]', - version=version.get_version(), - url='autotest.kernel.org', - package_dir={'autotest.mirror': mirror_dir }, - packages=['autotest.mirror' ], - data_files=[('share/autotest/mirror', [ mirror_dir + '/mirror' ])], -) +def run(): + setup(name='autotest', + description='Autotest testing framework - mirror module', + author='Autotest Team', + author_email='[email protected]', + version=version.get_version(), + url='autotest.kernel.org', + package_dir={'autotest.mirror': mirror_dir }, + packages=['autotest.mirror' ], + data_files=[('share/autotest/mirror', [ mirror_dir + '/mirror' ])], + ) + +if __name__ == '__main__': + run() diff --git a/scheduler/setup.py b/scheduler/setup.py index 0aba98d..548e702 100644 --- a/scheduler/setup.py +++ b/scheduler/setup.py @@ -12,16 +12,20 @@ from autotest.client.shared import version scheduler_dir = os.path.dirname(sys.modules[__name__].__file__) or '.' autotest_dir = os.path.abspath(os.path.join(scheduler_dir, "..")) -setup(name='autotest', - description='Autotest testing framework - scheduler module', - author='Autotest Team', - author_email='[email protected]', - version=version.get_version(), - url='autotest.kernel.org', - package_dir={'autotest.scheduler': scheduler_dir }, - package_data={'autotest.scheduler': ['archive_results.control.srv']}, - packages=['autotest.scheduler' ], - scripts=[scheduler_dir + '/autotest-scheduler', - scheduler_dir + '/autotest-scheduler-watcher', - ], -) +def run(): + setup(name='autotest', + description='Autotest testing framework - scheduler module', + author='Autotest Team', + author_email='[email protected]', + version=version.get_version(), + url='autotest.kernel.org', + package_dir={'autotest.scheduler': scheduler_dir }, + package_data={'autotest.scheduler': ['archive_results.control.srv']}, + packages=['autotest.scheduler' ], + scripts=[scheduler_dir + '/autotest-scheduler', + scheduler_dir + '/autotest-scheduler-watcher', + ], + ) + +if __name__ == "__main__": + run() diff --git a/server/setup.py b/server/setup.py index 3476ce5..57adf9e 100644 --- a/server/setup.py +++ b/server/setup.py @@ -29,18 +29,22 @@ pd_filelist.extend(get_data_files(os.path.join(server_dir, 'control_segments'))) pd_filelist.extend(get_data_files(os.path.join(server_dir, 'hosts', 'monitors'))) pd_filelist.extend(get_data_files(os.path.join(server_dir, 'tests'))) -setup(name='autotest', - description='Autotest testing framework - remote module', - author='Autotest Team', - author_email='[email protected]', - version=version.get_version(), - url='autotest.kernel.org', - package_dir={'autotest.server': server_dir }, - package_data={'autotest.server' : pd_filelist }, - packages=['autotest.server.hosts', - 'autotest.server.hosts.monitors', - 'autotest.server', - ], - scripts=[server_dir + '/autotest-remote', - ], -) +def run(): + setup(name='autotest', + description='Autotest testing framework - remote module', + author='Autotest Team', + author_email='[email protected]', + version=version.get_version(), + url='autotest.kernel.org', + package_dir={'autotest.server': server_dir }, + package_data={'autotest.server' : pd_filelist }, + packages=['autotest.server.hosts', + 'autotest.server.hosts.monitors', + 'autotest.server', + ], + scripts=[server_dir + '/autotest-remote', + ], + ) + +if __name__ == '__main__': + run() diff --git a/setup.py b/setup.py index c389523..a8f3a61 100644 --- a/setup.py +++ b/setup.py @@ -8,3 +8,14 @@ import database.setup import tko.setup import utils.setup import mirror.setup + +if __name__ == '__main__': + client.setup.run() + frontend.setup.run() + cli.setup.run() + server.setup.run() + scheduler.setup.run() + database.setup.run() + tko.setup.run() + utils.setup.run() + mirror.setup.run() diff --git a/tko/setup.py b/tko/setup.py index 062def9..3789e69 100644 --- a/tko/setup.py +++ b/tko/setup.py @@ -14,32 +14,36 @@ tko_dir = os.path.dirname(sys.modules[__name__].__file__) or '.' # TODO: add some toplevel non-python files -setup(name='autotest', - description='Autotest testing framework - tko module', - author='Autotest Team', - author_email='[email protected]', - version=version.get_version(), - url='autotest.kernel.org', - package_dir={'autotest.tko': tko_dir }, - package_data={'autotest.tko' : ['*.cgi', - ], - }, - packages=['autotest.tko.migrations', - 'autotest.tko.parsers', - 'autotest.tko.parsers.test', - 'autotest.tko.parsers.test.templates', - 'autotest.tko', - ], - data_files=[('share/autotest/tko', [ tko_dir + '/blank.gif', - tko_dir + '/draw_graphs', - tko_dir + '/machine_load', - tko_dir + '/parse', - tko_dir + '/plotgraph', - tko_dir + '/retrieve_jobs', - tko_dir + '/tko.proto', - ]), - ], - scripts=[tko_dir + '/autotest-db-delete-job', - tko_dir + '/autotest-tko-parse', - ], -) +def run(): + setup(name='autotest', + description='Autotest testing framework - tko module', + author='Autotest Team', + author_email='[email protected]', + version=version.get_version(), + url='autotest.kernel.org', + package_dir={'autotest.tko': tko_dir }, + package_data={'autotest.tko' : ['*.cgi', + ], + }, + packages=['autotest.tko.migrations', + 'autotest.tko.parsers', + 'autotest.tko.parsers.test', + 'autotest.tko.parsers.test.templates', + 'autotest.tko', + ], + data_files=[('share/autotest/tko', [ tko_dir + '/blank.gif', + tko_dir + '/draw_graphs', + tko_dir + '/machine_load', + tko_dir + '/parse', + tko_dir + '/plotgraph', + tko_dir + '/retrieve_jobs', + tko_dir + '/tko.proto', + ]), + ], + scripts=[tko_dir + '/autotest-db-delete-job', + tko_dir + '/autotest-tko-parse', + ], + ) + +if __name__ == '__main__': + run() diff --git a/utils/setup.py b/utils/setup.py index 04ac43c..ca59f31 100644 --- a/utils/setup.py +++ b/utils/setup.py @@ -13,22 +13,26 @@ utils_dir = os.path.dirname(sys.modules[__name__].__file__) or '.' # TODO handle the init scripts -setup(name='autotest', - description='Autotest testing framework - utility scripts', - author='Autotest Team', - author_email='[email protected]', - version=version.get_version(), - url='autotest.kernel.org', - package_dir={'autotest.utils': utils_dir }, - package_data={'autotest.utils' : ['named_semaphore/*', - 'modelviz/*', - ], - }, - packages=['autotest.utils'], - data_files=[('share/autotest/utils', [ utils_dir + '/autotestd.service', - utils_dir + '/autotest.init', - utils_dir + '/autotest-rh.init', - utils_dir + '/release' - ]) - ], -) +def run(): + setup(name='autotest', + description='Autotest testing framework - utility scripts', + author='Autotest Team', + author_email='[email protected]', + version=version.get_version(), + url='autotest.kernel.org', + package_dir={'autotest.utils': utils_dir }, + package_data={'autotest.utils' : ['named_semaphore/*', + 'modelviz/*', + ], + }, + packages=['autotest.utils'], + data_files=[('share/autotest/utils', [ utils_dir + '/autotestd.service', + utils_dir + '/autotest.init', + utils_dir + '/autotest-rh.init', + utils_dir + '/release' + ]) + ], + ) + +if __name__ == '__main__': + run() -- 1.8.0 _______________________________________________ Autotest-kernel mailing list [email protected] https://www.redhat.com/mailman/listinfo/autotest-kernel
