From 1bc9baa5c769c2b7185001f979ee3a9eca99259c Mon Sep 17 00:00:00 2001 From: William Deegan Date: Tue, 29 Nov 2022 08:05:10 -0800 Subject: [ci skip] Fix remaining sider complaints --- testing/framework/TestSCons.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/testing/framework/TestSCons.py b/testing/framework/TestSCons.py index eb907b8..dae6b0e 100644 --- a/testing/framework/TestSCons.py +++ b/testing/framework/TestSCons.py @@ -44,7 +44,7 @@ import zipfile from collections import namedtuple from TestCommon import * -from TestCommon import __all__ +from TestCommon import __all__, _python_ from SCons.Util import get_hash_format, get_current_hash_algorithm_used from TestCmd import Popen @@ -62,13 +62,7 @@ python_version_unsupported = (3, 6, 0) python_version_deprecated = (3, 6, 0) python_version_supported_str = "3.6.0" # str of lowest non-deprecated version -# In the checked-in source, the value of SConsVersion in the following -# line must remain "__ VERSION __" (without the spaces) so the built -# version in build/testing/framework/TestSCons.py contains the actual version -# string of the packages that have been built. -SConsVersion = '__VERSION__' -if SConsVersion == f"__VERSION__": - SConsVersion = default_version +SConsVersion = default_version __all__.extend([ 'TestSCons', -- cgit v0.12