From ddf6b961b106af56cffbc464fe11b5b595f8eba6 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Thu, 2 Apr 2020 12:01:26 +0200 Subject: [PATCH] appveyor: use VV to set logging level and silence dependency builds --- .appveyor.yml | 2 ++ appveyor/do.py | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 53c72d9..75b638b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -61,6 +61,7 @@ environment: SETUP_PATH: .:.ci SET: test01 BASE: 3.15 + VV: 1 matrix: - CC: vs2019 @@ -68,6 +69,7 @@ environment: SET: test00 - CC: mingw APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + VV: 0 - CC: vs2019 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - CC: vs2017 diff --git a/appveyor/do.py b/appveyor/do.py index 8bb1164..9c19f6f 100644 --- a/appveyor/do.py +++ b/appveyor/do.py @@ -12,7 +12,6 @@ import subprocess as sp import distutils.util logger = logging.getLogger(__name__) -logging.basicConfig(level=logging.DEBUG) # Setup ANSI Colors ANSI_RED = "\033[31;1m" @@ -53,6 +52,7 @@ def modlist(): zip7 = r'C:\Program Files\7-Zip\7z' make = '' isbase314 = False +silent_dep_builds = True def host_info(): print('{0}Python setup{1}'.format(ANSI_CYAN, ANSI_RESET)) @@ -474,7 +474,7 @@ def prepare(args): for mod in modlist(): place = places[setup[mod+"_VARNAME"]] print('{0}Building dependency {1} in {2}{3}'.format(ANSI_YELLOW, mod, place, ANSI_RESET)) - call_make(cwd=place) #TBD: default should be silent + call_make(cwd=place, silent=silent_dep_builds) print('{0}Dependency module information{1}'.format(ANSI_CYAN, ANSI_RESET)) print('Module Tag Binaries Commit') @@ -580,7 +580,12 @@ def getargs(): return P def main(raw): + global silent_dep_builds args = getargs().parse_args(raw) + if 'VV' in os.environ and os.environ['VV'] == '1': + logging.basicConfig(level=logging.DEBUG) + silent_dep_builds = False + if args.vcvars and os.environ['CC'].startswith('vs'): # re-exec with MSVC in PATH with_vcvars(' '.join(['--no-vcvars']+raw))