jenkins-bot has submitted this change and it was merged.
Change subject: make-release: use space for indentation
......................................................................
make-release: use space for indentation
The python way to indent is to use four spaces, not tabs. Also slightly
reindented some structures such as lists.
Change-Id: Ib9812f1e7b50760d74dc5bd77042a93feac6d54a
---
M make-release/make-release
M tox.ini
2 files changed, 314 insertions(+), 317 deletions(-)
Approvals:
Demon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/make-release/make-release b/make-release/make-release
index c9a57a6..a0554cf 100755
--- a/make-release/make-release
+++ b/make-release/make-release
@@ -1,4 +1,5 @@
#!/usr/bin/python
+# vim:sw=4:ts=4:et:
import getopt
import hashlib
@@ -10,7 +11,7 @@
def dieUsage():
- print """
+ print """
Usage:
./make-release --snapshot
./make-release [--yes] [--no-previous] <next-version> [<previous-version>]
@@ -24,400 +25,398 @@
Use --no-previous to disable the diff to previous entirely.
"""
- sys.exit(1)
+ sys.exit(1)
def main():
- try:
- options, args = getopt.getopt(sys.argv[1:], '', ['help',
'snapshot', 'yes', 'no-previous', 'git-root=', 'smw'])
- except getopt.GetoptError, err:
- print str(err)
- dieUsage()
+ try:
+ options, args = getopt.getopt(sys.argv[1:], '', ['help', 'snapshot',
'yes', 'no-previous', 'git-root=', 'smw'])
+ except getopt.GetoptError, err:
+ print str(err)
+ dieUsage()
- extensions = []
- smwExtensions = ["SemanticMediaWiki", "SemanticResultFormats",
"SemanticForms",
- "SemanticCompoundQueries", "SemanticInternalObjects",
"SemanticDrilldown",
- "SemanticMaps", "SemanticWatchlist", "SemanticTasks",
"SemanticFormsInputs",
- "SemanticImageInput", "Validator", "AdminLinks",
"ApprovedRevs", "Arrays", "DataTransfer",
- "ExternalData", "HeaderTabs", "Maps", "PageSchemas",
"ReplaceText", "Widgets"]
- snapshot = False
- yes = False
- noPrevious = False
- gitRoot = 'ssh://gerrit.wikimedia.org:29418/mediawiki'
- smw = False
- for name, value in options:
- if name == '--help':
- dieUsage()
- elif name == '--snapshot':
- snapshot = True
- elif name == '--yes':
- yes = True
- elif name == '--no-previous':
- noPrevious = True
- elif name == '--git-root':
- gitRoot = value
- elif name == '--smw':
- smw = True
+ extensions = []
+ smwExtensions = [
+ "SemanticMediaWiki", "SemanticResultFormats", "SemanticForms",
+ "SemanticCompoundQueries", "SemanticInternalObjects",
"SemanticDrilldown",
+ "SemanticMaps", "SemanticWatchlist", "SemanticTasks",
"SemanticFormsInputs",
+ "SemanticImageInput", "Validator", "AdminLinks", "ApprovedRevs",
"Arrays", "DataTransfer",
+ "ExternalData", "HeaderTabs", "Maps", "PageSchemas", "ReplaceText",
"Widgets"]
+ snapshot = False
+ yes = False
+ noPrevious = False
+ gitRoot = 'ssh://gerrit.wikimedia.org:29418/mediawiki'
+ smw = False
+ for name, value in options:
+ if name == '--help':
+ dieUsage()
+ elif name == '--snapshot':
+ snapshot = True
+ elif name == '--yes':
+ yes = True
+ elif name == '--no-previous':
+ noPrevious = True
+ elif name == '--git-root':
+ gitRoot = value
+ elif name == '--smw':
+ smw = True
- # Snapshot release?
- if snapshot:
- makeRelease(
- version='snapshot-' + time.strftime('%Y%m%d',
time.gmtime()),
- branch='trunk',
- dir='snapshots',
- gitRoot=gitRoot)
- return
+ # Snapshot release?
+ if snapshot:
+ makeRelease(
+ version='snapshot-' + time.strftime('%Y%m%d', time.gmtime()),
+ branch='trunk',
+ dir='snapshots',
+ gitRoot=gitRoot)
+ return
- # Need a version specified if not snapshot
- if len(args) == 0:
- dieUsage()
+ # Need a version specified if not snapshot
+ if len(args) == 0:
+ dieUsage()
- decomposed = decomposeVersion(args[0])
- if decomposed is None:
- print 'Invalid version number "%s"' % (args[0])
- sys.exit(1)
+ decomposed = decomposeVersion(args[0])
+ if decomposed is None:
+ print 'Invalid version number "%s"' % (args[0])
+ sys.exit(1)
- version = decomposed['major']
+ version = decomposed['major']
- if smw:
- # Other extensions for inclusion
- for ext in smwExtensions:
- extensions.append(ext)
+ if smw:
+ # Other extensions for inclusion
+ for ext in smwExtensions:
+ extensions.append(ext)
- if len(args) >= 2:
- # Given the previous version on the command line
- makeRelease(
- extensions=extensions,
- version=args[0],
- prevVersion=args[1],
- prevBranch=versionToBranch(args[1]),
- branch=decomposed['branch'],
- dir=decomposed['major'],
- gitRoot=gitRoot)
- return
+ if len(args) >= 2:
+ # Given the previous version on the command line
+ makeRelease(
+ extensions=extensions,
+ version=args[0],
+ prevVersion=args[1],
+ prevBranch=versionToBranch(args[1]),
+ branch=decomposed['branch'],
+ dir=decomposed['major'],
+ gitRoot=gitRoot)
+ return
- if decomposed['prevVersion'] is None:
- if not ask("No previous release found. Do you want to make a
release with no patch?"):
- print 'Please specify the correct previous release on
the command line'
- sys.exit(1)
- else:
- noPrevious = True
+ if decomposed['prevVersion'] is None:
+ if not ask("No previous release found. Do you want to make a release
with no patch?"):
+ print 'Please specify the correct previous release on the command
line'
+ sys.exit(1)
+ else:
+ noPrevious = True
- if noPrevious:
- makeRelease(
- extensions=extensions,
- version=args[0],
- branch=decomposed['branch'],
- dir=decomposed['major'],
- gitRoot=gitRoot)
- else:
- if not ask("Was %s the previous release?" %
(decomposed['prevVersion'])):
- print 'Please specify the correct previous release on
the command line'
- sys.exit(1)
+ if noPrevious:
+ makeRelease(
+ extensions=extensions,
+ version=args[0],
+ branch=decomposed['branch'],
+ dir=decomposed['major'],
+ gitRoot=gitRoot)
+ else:
+ if not ask("Was %s the previous release?" %
(decomposed['prevVersion'])):
+ print 'Please specify the correct previous release on the command
line'
+ sys.exit(1)
- makeRelease(
- extensions=extensions,
- version=args[0],
- prevVersion=decomposed['prevVersion'],
- prevBranch=decomposed['prevBranch'],
- branch=decomposed['branch'],
- dir=decomposed['major'],
- gitRoot=gitRoot)
+ makeRelease(
+ extensions=extensions,
+ version=args[0],
+ prevVersion=decomposed['prevVersion'],
+ prevBranch=decomposed['prevBranch'],
+ branch=decomposed['branch'],
+ dir=decomposed['major'],
+ gitRoot=gitRoot)
def ask(question):
- while True:
- print question + ' [y/n] ',
- response = sys.stdin.readline()
- if len(response) > 0:
- if response[0].lower() == 'y':
- return True
- elif response[0].lower() == 'n':
- return False
- print 'Please type "y" for yes or "n" for no'
+ while True:
+ print question + ' [y/n] ',
+ response = sys.stdin.readline()
+ if len(response) > 0:
+ if response[0].lower() == 'y':
+ return True
+ elif response[0].lower() == 'n':
+ return False
+ print 'Please type "y" for yes or "n" for no'
def decomposeVersion(version):
- ret = {}
- m = re.compile('(\d+)\.(\d+)\.(\d+)$').match(version)
- if m is not None:
- ret['major'] = m.group(1) + "." + m.group(2)
- ret['branch'] = 'tags/' + m.group(1) + '.' + m.group(2) + '.' +
m.group(3)
- if int(m.group(3)) == 0:
- ret['prevVersion'] = None
- else:
- newMinor = str(int(m.group(3)) - 1)
- ret['prevVersion'] = ret['major'] + '.' + newMinor
- ret['prevBranch'] = 'tags/' + m.group(1) + '.' +
m.group(2) + '.' + newMinor
- return ret
+ ret = {}
+ m = re.compile('(\d+)\.(\d+)\.(\d+)$').match(version)
+ if m is not None:
+ ret['major'] = m.group(1) + "." + m.group(2)
+ ret['branch'] = 'tags/' + m.group(1) + '.' + m.group(2) + '.' +
m.group(3)
+ if int(m.group(3)) == 0:
+ ret['prevVersion'] = None
+ else:
+ newMinor = str(int(m.group(3)) - 1)
+ ret['prevVersion'] = ret['major'] + '.' + newMinor
+ ret['prevBranch'] = 'tags/' + m.group(1) + '.' + m.group(2) + '.'
+ newMinor
+ return ret
- m = re.compile('(\d+)\.(\d+)\.(\d+)([A-Za-z]+)(\d+)$').match(version)
- if m is None:
- return None
+ m = re.compile('(\d+)\.(\d+)\.(\d+)([A-Za-z]+)(\d+)$').match(version)
+ if m is None:
+ return None
- ret['major'] = m.group(1) + "." + m.group(2)
- ret['branch'] = ('tags/' + m.group(1) + '.' + m.group(2) + '.' +
m.group(3) +
- m.group(4) + m.group(5))
- if int(m.group(5)) == 0:
- ret['prevVersion'] = None
- else:
- newMinor = str(int(m.group(5)) - 1)
- ret['prevVersion'] = ret['major'] + "." + m.group(3) +
m.group(4) + newMinor
- ret['prevBranch'] = ('tags/' + m.group(1) + '.' + m.group(2) +
'.' + m.group(3) +
- m.group(4) + newMinor)
- return ret
+ ret['major'] = m.group(1) + "." + m.group(2)
+ ret['branch'] = ('tags/' + m.group(1) + '.' + m.group(2) + '.' +
m.group(3) + m.group(4) + m.group(5))
+ if int(m.group(5)) == 0:
+ ret['prevVersion'] = None
+ else:
+ newMinor = str(int(m.group(5)) - 1)
+ ret['prevVersion'] = ret['major'] + "." + m.group(3) + m.group(4) +
newMinor
+ ret['prevBranch'] = ('tags/' + m.group(1) + '.' + m.group(2) + '.' +
m.group(3) + m.group(4) + newMinor)
+ return ret
def versionToBranch(version):
- return 'tags/' + version
+ return 'tags/' + version
def hashfile(fileName, algorithm):
- f = open(fileName, 'r')
- hash = hashlib.new(algorithm)
- while True:
- buf = f.read(16384)
- if buf == '':
- break
- hash.update(buf)
- f.close()
- return hash.hexdigest()
+ f = open(fileName, 'r')
+ hash = hashlib.new(algorithm)
+ while True:
+ buf = f.read(16384)
+ if buf == '':
+ break
+ hash.update(buf)
+ f.close()
+ return hash.hexdigest()
def getGit(repo, dir, label):
- if (os.path.exists(dir)):
- print "Updating " + label + " in " + dir + "..."
- proc = subprocess.Popen(['sh', '-c', 'cd ' + dir + '; git fetch
-q --all'])
- else:
- print "Cloning " + label + " into " + dir + "..."
- proc = subprocess.Popen(['git', 'clone', '-q', repo, dir])
+ if (os.path.exists(dir)):
+ print "Updating " + label + " in " + dir + "..."
+ proc = subprocess.Popen(['sh', '-c', 'cd ' + dir + '; git fetch -q
--all'])
+ else:
+ print "Cloning " + label + " into " + dir + "..."
+ proc = subprocess.Popen(['git', 'clone', '-q', repo, dir])
- if proc.wait() != 0:
- print "git clone failed, exiting"
- sys.exit(1)
+ if proc.wait() != 0:
+ print "git clone failed, exiting"
+ sys.exit(1)
def patchExport(patch, dir, gitRoot):
- os.chdir(dir)
- print "Applying patch " . patch
+ os.chdir(dir)
+ print "Applying patch " . patch
- # git fetch ssh://[email protected]:29418/mediawiki/core
refs/changes/06/7606/1 && git cherry-pick FETCH_HEAD
- proc = subprocess.Popen(['git', 'fetch', gitRoot + '/core', patch,
'&&', 'git', 'cherry-pick', 'FETCH_HEAD'])
+ # git fetch ssh://[email protected]:29418/mediawiki/core
refs/changes/06/7606/1 && git cherry-pick FETCH_HEAD
+ proc = subprocess.Popen(['git', 'fetch', gitRoot + '/core', patch, '&&',
'git', 'cherry-pick', 'FETCH_HEAD'])
- if proc.wait() != 0:
- print "git patch failed, exiting"
- sys.exit(1)
+ if proc.wait() != 0:
+ print "git patch failed, exiting"
+ sys.exit(1)
- os.chdir('..')
- print "Done"
+ os.chdir('..')
+ print "Done"
def export(tag, dir, gitRoot):
- getGit(gitRoot + '/core.git', dir, "core")
+ getGit(gitRoot + '/core.git', dir, "core")
- os.chdir(dir)
+ os.chdir(dir)
- if tag != 'trunk':
- print "Checking out %s..." % (tag)
- proc = subprocess.Popen(['git', 'checkout', tag])
+ if tag != 'trunk':
+ print "Checking out %s..." % (tag)
+ proc = subprocess.Popen(['git', 'checkout', tag])
- if proc.wait() != 0:
- print "git checkout failed, exiting"
- sys.exit(1)
+ if proc.wait() != 0:
+ print "git checkout failed, exiting"
+ sys.exit(1)
- os.chdir('..')
- print "Done"
+ os.chdir('..')
+ print "Done"
def exportExtension(branch, extension, dir, gitRoot):
- getGit(gitRoot + '/extensions/' + extension + '.git', dir +
'/extensions/' + extension, extension)
- print "Done"
+ getGit(gitRoot + '/extensions/' + extension + '.git', dir + '/extensions/'
+ extension, extension)
+ print "Done"
def makePatch(patchFileName, dir1, dir2, type):
- patchFile = open(patchFileName, 'w')
- args = ['diff', '-Nruw']
- if type == 'i18n':
- print "Generating i18n patch file..."
- dir1 += '/languages/messages'
- dir2 += '/languages/messages'
- else:
- print "Generating normal patch file..."
- excludedExtensions = ['messages', '*.png', '*.jpg', '*.xcf',
'*.gif', '*.svg', '*.tiff', '*.zip', '*.xmp', '.git*']
- for ext in excludedExtensions:
- args.extend(['-x', ext])
+ patchFile = open(patchFileName, 'w')
+ args = ['diff', '-Nruw']
+ if type == 'i18n':
+ print "Generating i18n patch file..."
+ dir1 += '/languages/messages'
+ dir2 += '/languages/messages'
+ else:
+ print "Generating normal patch file..."
+ excludedExtensions = ['messages', '*.png', '*.jpg', '*.xcf', '*.gif',
'*.svg', '*.tiff', '*.zip', '*.xmp', '.git*']
+ for ext in excludedExtensions:
+ args.extend(['-x', ext])
- args.extend([dir1, dir2])
- print ' '.join(args)
- diffProc = subprocess.Popen(args, stdout=subprocess.PIPE)
- gzipProc = subprocess.Popen(['gzip', '-9'], stdin=diffProc.stdout,
stdout=patchFile)
+ args.extend([dir1, dir2])
+ print ' '.join(args)
+ diffProc = subprocess.Popen(args, stdout=subprocess.PIPE)
+ gzipProc = subprocess.Popen(['gzip', '-9'], stdin=diffProc.stdout,
stdout=patchFile)
- diffStatus = diffProc.wait()
- gzipStatus = gzipProc.wait()
+ diffStatus = diffProc.wait()
+ gzipStatus = gzipProc.wait()
- if diffStatus > 1 or gzipStatus != 0:
- print "diff failed, exiting"
- print "diff: " + str(diffStatus)
- print "gzip: " + str(gzipStatus)
- sys.exit(1)
- patchFile.close()
- print "Done"
- return diffStatus == 1
+ if diffStatus > 1 or gzipStatus != 0:
+ print "diff failed, exiting"
+ print "diff: " + str(diffStatus)
+ print "gzip: " + str(gzipStatus)
+ sys.exit(1)
+ patchFile.close()
+ print "Done"
+ return diffStatus == 1
def getVersionExtensions(version, extensions=[]):
- coreExtensions = ['ConfirmEdit', 'Gadgets', 'Nuke', 'ParserFunctions',
'PdfHandler', 'Renameuser',
- 'SpamBlacklist', 'Vector', 'WikiEditor']
- newExtensions = ['Cite',
- 'ImageMap',
- 'Interwiki',
- 'TitleBlacklist',
- 'SpamBlacklist',
- 'Poem',
- 'InputBox',
- 'LocalisationUpdate',
- 'SyntaxHighlight_GeSHi'
- ]
- oldCoreExtensions = ['ConfirmEdit', 'Gadgets', 'Nuke',
'ParserFunctions', 'Renameuser', 'Vector', 'WikiEditor']
+ coreExtensions = ['ConfirmEdit', 'Gadgets', 'Nuke', 'ParserFunctions',
'PdfHandler', 'Renameuser', 'SpamBlacklist', 'Vector', 'WikiEditor']
+ newExtensions = [
+ 'Cite',
+ 'ImageMap',
+ 'Interwiki',
+ 'TitleBlacklist',
+ 'SpamBlacklist',
+ 'Poem',
+ 'InputBox',
+ 'LocalisationUpdate',
+ 'SyntaxHighlight_GeSHi'
+ ]
+ oldCoreExtensions = ['ConfirmEdit', 'Gadgets', 'Nuke', 'ParserFunctions',
'Renameuser', 'Vector', 'WikiEditor']
- # Export extensions for inclusion
- if version > '1.21':
- extensions += coreExtensions + newExtensions
- elif version > '1.20':
- extensions += coreExtensions
- elif version > '1.17':
- extensions += oldCoreExtensions
+ # Export extensions for inclusion
+ if version > '1.21':
+ extensions += coreExtensions + newExtensions
+ elif version > '1.20':
+ extensions += coreExtensions
+ elif version > '1.17':
+ extensions += oldCoreExtensions
- return extensions
+ return extensions
def makeTarFile(package, file, dir, rootDir, argAdd=[]):
- # Generate the .tar.gz file
- outFile = open(dir + '/' + file + '.tar.gz', 'w')
- args = ['tar', '--format=gnu', '--exclude-vcs', '--exclude-from',
rootDir + '/tarignore']
- args += argAdd
- args += ['-c', package]
- print ' '.join(args)
- exit
- tarProc = subprocess.Popen(args, stdout=subprocess.PIPE)
- gzipProc = subprocess.Popen(['gzip', '-9'],
- stdin=tarProc.stdout, stdout=outFile)
+ # Generate the .tar.gz file
+ outFile = open(dir + '/' + file + '.tar.gz', 'w')
+ args = ['tar', '--format=gnu', '--exclude-vcs', '--exclude-from', rootDir
+ '/tarignore']
+ args += argAdd
+ args += ['-c', package]
+ print ' '.join(args)
+ exit
+ tarProc = subprocess.Popen(args, stdout=subprocess.PIPE)
+ gzipProc = subprocess.Popen(['gzip', '-9'], stdin=tarProc.stdout,
stdout=outFile)
- if tarProc.wait() != 0 or gzipProc.wait() != 0:
- print "tar/gzip failed, exiting"
- sys.exit(1)
- outFile.close()
- targz = file + '.tar.gz'
- print targz + ' written'
- return targz
+ if tarProc.wait() != 0 or gzipProc.wait() != 0:
+ print "tar/gzip failed, exiting"
+ sys.exit(1)
+ outFile.close()
+ targz = file + '.tar.gz'
+ print targz + ' written'
+ return targz
def makeRelease(version, branch, dir, gitRoot, prevVersion=None,
prevBranch=None, extensions=[]):
- if not os.path.exists('build'):
- os.mkdir('build')
- if not os.path.exists('uploads'):
- os.mkdir('uploads')
- rootDir = os.getcwd()
- os.chdir('build')
+ if not os.path.exists('build'):
+ os.mkdir('build')
+ if not os.path.exists('uploads'):
+ os.mkdir('uploads')
+ rootDir = os.getcwd()
+ os.chdir('build')
- if not os.path.exists(dir):
- os.mkdir(dir)
+ if not os.path.exists(dir):
+ os.mkdir(dir)
- package = 'mediawiki-' + version
+ package = 'mediawiki-' + version
- # Export the target
- export(branch, package, gitRoot)
+ # Export the target
+ export(branch, package, gitRoot)
- patchRevisions = []
- for patch in patchRevisions:
- patchExport(patch, package, gitRoot)
+ patchRevisions = []
+ for patch in patchRevisions:
+ patchExport(patch, package, gitRoot)
- extExclude = []
- for ext in getVersionExtensions(version, extensions):
- exportExtension(branch, ext, package, gitRoot)
- extExclude.append("--exclude")
- extExclude.append("extensions/" + ext)
+ extExclude = []
+ for ext in getVersionExtensions(version, extensions):
+ exportExtension(branch, ext, package, gitRoot)
+ extExclude.append("--exclude")
+ extExclude.append("extensions/" + ext)
- # Generate the .tar.gz files
- outFiles = []
- outFiles.append(makeTarFile(package, 'mediawiki-core-' + version, dir,
rootDir, extExclude))
- outFiles.append(makeTarFile(package, package, dir, rootDir))
+ # Generate the .tar.gz files
+ outFiles = []
+ outFiles.append(makeTarFile(package, 'mediawiki-core-' + version, dir,
rootDir, extExclude))
+ outFiles.append(makeTarFile(package, package, dir, rootDir))
- # Patch
- if prevVersion is not None:
- prevDir = 'mediawiki-' + prevVersion
- export(prevBranch, prevDir, gitRoot)
+ # Patch
+ if prevVersion is not None:
+ prevDir = 'mediawiki-' + prevVersion
+ export(prevBranch, prevDir, gitRoot)
- for ext in getVersionExtensions(prevVersion, extensions):
- exportExtension(branch, ext, package, gitRoot)
+ for ext in getVersionExtensions(prevVersion, extensions):
+ exportExtension(branch, ext, package, gitRoot)
- makePatch(dir + '/' + package + '.patch.gz', prevDir, package,
'normal')
- outFiles.append(package + '.patch.gz')
- print package + '.patch.gz written'
- haveI18n = False
- if os.path.exists(package + '/languages/messages'):
- i18nPatch = 'mediawiki-i18n-' + version + '.patch.gz'
- if (makePatch(dir + '/' + i18nPatch, prevDir, package,
'i18n')):
- outFiles.append(i18nPatch)
- print i18nPatch + ' written'
- haveI18n = True
+ makePatch(dir + '/' + package + '.patch.gz', prevDir, package,
'normal')
+ outFiles.append(package + '.patch.gz')
+ print package + '.patch.gz written'
+ haveI18n = False
+ if os.path.exists(package + '/languages/messages'):
+ i18nPatch = 'mediawiki-i18n-' + version + '.patch.gz'
+ if (makePatch(dir + '/' + i18nPatch, prevDir, package, 'i18n')):
+ outFiles.append(i18nPatch)
+ print i18nPatch + ' written'
+ haveI18n = True
- # Sign
- uploadFiles = []
- for fileName in outFiles:
- proc = subprocess.Popen(['gpg', '--detach-sign', dir + '/' +
fileName])
- if proc.wait() != 0:
- print "gpg failed, exiting"
- sys.exit(1)
- uploadFiles.append(dir + '/' + fileName)
- uploadFiles.append(dir + '/' + fileName + '.sig')
+ # Sign
+ uploadFiles = []
+ for fileName in outFiles:
+ proc = subprocess.Popen(['gpg', '--detach-sign', dir + '/' + fileName])
+ if proc.wait() != 0:
+ print "gpg failed, exiting"
+ sys.exit(1)
+ uploadFiles.append(dir + '/' + fileName)
+ uploadFiles.append(dir + '/' + fileName + '.sig')
- # Generate upload tarball
- args = ['tar', 'cf', '../uploads/upload-' + version + '.tar']
- args.extend(uploadFiles)
- proc = subprocess.Popen(args)
- if proc.wait() != 0:
- print "Failed to generate upload.tar, exiting"
- sys.exit(1)
+ # Generate upload tarball
+ args = ['tar', 'cf', '../uploads/upload-' + version + '.tar']
+ args.extend(uploadFiles)
+ proc = subprocess.Popen(args)
+ if proc.wait() != 0:
+ print "Failed to generate upload.tar, exiting"
+ sys.exit(1)
- # Write email template
- print
- print "Full release notes:"
- url = 'https://svn.wikimedia.org/svnroot/mediawiki/' + branch +
'/phase3/RELEASE-NOTES'
- if dir > '1.17':
- url += '-' + dir
+ # Write email template
+ print
+ print "Full release notes:"
+ url = 'https://svn.wikimedia.org/svnroot/mediawiki/' + branch +
'/phase3/RELEASE-NOTES'
+ if dir > '1.17':
+ url += '-' + dir
- print url
- print 'https://www.mediawiki.org/wiki/Release_notes/' + dir
- print
- print
- print
'**********************************************************************'
+ print url
+ print 'https://www.mediawiki.org/wiki/Release_notes/' + dir
+ print
+ print
+ print
'**********************************************************************'
- print 'Download:'
- print 'http://download.wikimedia.org/mediawiki/' + dir + '/' + package
+ '.tar.gz'
- print
+ print 'Download:'
+ print 'http://download.wikimedia.org/mediawiki/' + dir + '/' + package +
'.tar.gz'
+ print
- if prevVersion is not None:
- if haveI18n:
- print "Patch to previous version (" + prevVersion + "),
without interface text:"
- print 'http://download.wikimedia.org/mediawiki/' + dir
+ '/' + package + '.patch.gz'
- print "Interface text changes:"
- print 'http://download.wikimedia.org/mediawiki/' + dir
+ '/' + i18nPatch
- else:
- print "Patch to previous version (" + prevVersion + "):"
- print 'http://download.wikimedia.org/mediawiki/' + dir
+ '/' + package + '.patch.gz'
- print
+ if prevVersion is not None:
+ if haveI18n:
+ print "Patch to previous version (" + prevVersion + "), without
interface text:"
+ print 'http://download.wikimedia.org/mediawiki/' + dir + '/' +
package + '.patch.gz'
+ print "Interface text changes:"
+ print 'http://download.wikimedia.org/mediawiki/' + dir + '/' +
i18nPatch
+ else:
+ print "Patch to previous version (" + prevVersion + "):"
+ print 'http://download.wikimedia.org/mediawiki/' + dir + '/' +
package + '.patch.gz'
+ print
- print 'GPG signatures:'
- for fileName in outFiles:
- print 'http://download.wikimedia.org/mediawiki/' + dir + '/' +
fileName + '.sig'
- print
+ print 'GPG signatures:'
+ for fileName in outFiles:
+ print 'http://download.wikimedia.org/mediawiki/' + dir + '/' +
fileName + '.sig'
+ print
- print 'Public keys:'
- print 'https://www.mediawiki.org/keys/keys.html'
- print
+ print 'Public keys:'
+ print 'https://www.mediawiki.org/keys/keys.html'
+ print
- os.chdir('..')
+ os.chdir('..')
if __name__ == '__main__':
- main()
+ main()
diff --git a/tox.ini b/tox.ini
index 87df1fd..977fe02 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,9 @@
[flake8]
filename=*.py,make-release
-; W191 indentation contains tabs
; E501 line too long (X > 79 characters)
-ignore=W191,E501
+ignore=E501
[pep8]
filename=*.py,make-release
-; W191 indentation contains tabs
; E501 line too long (X > 79 characters)
-ignore=W191,E501
+ignore=E501
--
To view, visit https://gerrit.wikimedia.org/r/81036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9812f1e7b50760d74dc5bd77042a93feac6d54a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Demon <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
