From 812bf21740bf96f4fa4482a00d840c616be6ea55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Sun, 19 Nov 2017 15:01:12 +0100 Subject: [PATCH] Move imports close to point of usage in Python scripts This means that you no longer need urllib2 to regenerate single header file, etc --- scripts/releaseCommon.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/releaseCommon.py b/scripts/releaseCommon.py index 2acd4869..688b13ce 100644 --- a/scripts/releaseCommon.py +++ b/scripts/releaseCommon.py @@ -6,8 +6,6 @@ import re import string from scriptCommon import catchPath -import generateSingleHeader -import updateWandbox versionParser = re.compile( r'(\s*static\sVersion\sversion)\s*\(\s*(.*)\s*,\s*(.*)\s*,\s*(.*)\s*,\s*\"(.*)\"\s*,\s*(.*)\s*\).*' ) rootPath = os.path.join( catchPath, 'include/' ) @@ -80,6 +78,8 @@ class Version: f.write( line + "\n" ) def updateReadmeFile(version): + import updateWandbox + downloadParser = re.compile( r'' ) success, wandboxLink = updateWandbox.uploadFiles() if not success: @@ -142,7 +142,10 @@ def performUpdates(version): # First update version file, so we can regenerate single header and # have it ready for upload to wandbox, when updating readme version.updateVersionFile() + + import generateSingleHeader generateSingleHeader.generate(version) + updateReadmeFile(version) updateConanFile(version) updateConanTestFile(version)