internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 22:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add python version checking when using --tox.

Browse Source
This commit is contained in:
Matt Clay
2019-06-04 21:59:56 -07:00
parent 58f6604efa
commit 490edbdc48
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/runner/lib/config.py
View File

@@ -12,6 +12,7 @@ from lib.util import (
find_python,
generate_pip_command,
get_docker_completion,
ApplicationError,
)
from lib.metadata import (
@@ -67,7 +68,9 @@ class EnvironmentConfig(CommonConfig):
if self.python == 'default':
self.python = None
self.python_version = self.python or '.'.join(str(i) for i in sys.version_info[:2])
actual_major_minor = '.'.join(str(i) for i in sys.version_info[:2])
self.python_version = self.python or actual_major_minor
self.python_interpreter = args.python_interpreter
self.delegate = self.tox or self.docker or self.remote
@@ -79,6 +82,9 @@ class EnvironmentConfig(CommonConfig):
self.inject_httptester = args.inject_httptester if 'inject_httptester' in args else False # type: bool
self.httptester = docker_qualify_image(args.httptester if 'httptester' in args else '') # type: str
if args.check_python and args.check_python != actual_major_minor:
raise ApplicationError('Running under Python %s instead of Python %s as expected.' % (actual_major_minor, args.check_python))
@property
def python_executable(self):
"""