ansible-test no longer needs special casing in `__main__.py` (#83962)

pull/83864/head
Matt Martz 2 months ago committed by GitHub
parent 85d9a40aac
commit 9ab63986ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -3,9 +3,6 @@
from __future__ import annotations from __future__ import annotations
import argparse import argparse
import importlib
import os
import sys
from importlib.metadata import distribution from importlib.metadata import distribution
@ -19,22 +16,10 @@ def main():
ep_map = {_short_name(ep.name): ep for ep in dist.entry_points if ep.group == 'console_scripts'} ep_map = {_short_name(ep.name): ep for ep in dist.entry_points if ep.group == 'console_scripts'}
parser = argparse.ArgumentParser(prog='python -m ansible', add_help=False) parser = argparse.ArgumentParser(prog='python -m ansible', add_help=False)
parser.add_argument('entry_point', choices=list(ep_map) + ['test']) parser.add_argument('entry_point', choices=list(ep_map))
args, extra = parser.parse_known_args() args, extra = parser.parse_known_args()
if args.entry_point == 'test': main = ep_map[args.entry_point].load()
ansible_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
source_root = os.path.join(ansible_root, 'test', 'lib')
if os.path.exists(os.path.join(source_root, 'ansible_test', '_internal', '__init__.py')):
# running from source, use that version of ansible-test instead of any version that may already be installed
sys.path.insert(0, source_root)
module = importlib.import_module('ansible_test._util.target.cli.ansible_test_cli_stub')
main = module.main
else:
main = ep_map[args.entry_point].load()
main([args.entry_point] + extra) main([args.entry_point] + extra)

Loading…
Cancel
Save