jenkins-bot has submitted this change and it was merged.
Change subject: make-release: fix lines too longs
......................................................................
make-release: fix lines too longs
Fix pep8 errors: E501 line too long (X > 79 characters)
Change-Id: Ia5bccfdfd6298456155562e2508339fb68b57c5b
---
M make-release/make-release.py
D tox.ini
2 files changed, 108 insertions(+), 43 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/make-release/make-release.py b/make-release/make-release.py
index f65ecbc..6b0d7e0 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -34,11 +34,29 @@
extensions = []
smwExtensions = [
- "SemanticMediaWiki", "SemanticResultFormats", "SemanticForms",
- "SemanticCompoundQueries", "SemanticInternalObjects",
"SemanticDrilldown",
- "SemanticMaps", "SemanticWatchlist", "SemanticTasks",
"SemanticFormsInputs",
- "SemanticImageInput", "Validator", "AdminLinks", "ApprovedRevs",
"Arrays", "DataTransfer",
- "ExternalData", "HeaderTabs", "Maps", "PageSchemas", "ReplaceText",
"Widgets"]
+ 'SemanticMediaWiki',
+ 'SemanticResultFormats',
+ 'SemanticForms',
+ 'SemanticCompoundQueries',
+ 'SemanticInternalObjects',
+ 'SemanticDrilldown',
+ 'SemanticMaps',
+ 'SemanticWatchlist',
+ 'SemanticTasks',
+ 'SemanticFormsInputs',
+ 'SemanticImageInput',
+ 'Validator',
+ 'AdminLinks',
+ 'ApprovedRevs',
+ 'Arrays',
+ 'DataTransfer',
+ 'ExternalData',
+ 'HeaderTabs',
+ 'Maps',
+ 'PageSchemas',
+ 'ReplaceText',
+ 'Widgets',
+ ]
# No version specified, assuming a snapshot release
if options.nextversion is None:
@@ -74,8 +92,10 @@
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'
+ 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
@@ -88,8 +108,10 @@
dir=decomposed['major'],
gitRoot=options.gitroot)
else:
- if not ask("Was %s the previous release?" %
(decomposed['prevVersion'])):
- print 'Please specify the correct previous release on the command
line'
+ 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(
@@ -156,13 +178,15 @@
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)
+ 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
+ ret['prevBranch'] = ('tags/' + m.group(1) + '.' + m.group(2)
+ + '.' + newMinor)
return ret
m = re.compile('(\d+)\.(\d+)\.(\d+)([A-Za-z]+)(\d+)$').match(version)
@@ -170,13 +194,16 @@
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))
+ 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)
+ 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
@@ -199,7 +226,8 @@
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'])
+ 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])
@@ -213,8 +241,9 @@
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 the reference from Gerrit and cherry-pick it
+ proc = subprocess.Popen(['git', 'fetch', gitRoot + '/core', patch,
+ '&&', 'git', 'cherry-pick', 'FETCH_HEAD'])
if proc.wait() != 0:
print "git patch failed, exiting"
@@ -242,7 +271,8 @@
def exportExtension(branch, extension, dir, gitRoot):
- getGit(gitRoot + '/extensions/' + extension + '.git', dir + '/extensions/'
+ extension, extension)
+ getGit(gitRoot + '/extensions/' + extension + '.git',
+ dir + '/extensions/' + extension, extension)
print "Done"
@@ -255,14 +285,26 @@
dir2 += '/languages/messages'
else:
print "Generating normal patch file..."
- excludedExtensions = ['messages', '*.png', '*.jpg', '*.xcf', '*.gif',
'*.svg', '*.tiff', '*.zip', '*.xmp', '.git*']
+ 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)
+ gzipProc = subprocess.Popen(['gzip', '-9'], stdin=diffProc.stdout,
+ stdout=patchFile)
diffStatus = diffProc.wait()
gzipStatus = gzipProc.wait()
@@ -278,7 +320,17 @@
def getVersionExtensions(version, extensions=[]):
- coreExtensions = ['ConfirmEdit', 'Gadgets', 'Nuke', 'ParserFunctions',
'PdfHandler', 'Renameuser', 'SpamBlacklist', 'Vector', 'WikiEditor']
+ coreExtensions = [
+ 'ConfirmEdit',
+ 'Gadgets',
+ 'Nuke',
+ 'ParserFunctions',
+ 'PdfHandler',
+ 'Renameuser',
+ 'SpamBlacklist',
+ 'Vector',
+ 'WikiEditor',
+ ]
newExtensions = [
'Cite',
'ImageMap',
@@ -288,9 +340,17 @@
'Poem',
'InputBox',
'LocalisationUpdate',
- 'SyntaxHighlight_GeSHi'
+ 'SyntaxHighlight_GeSHi',
]
- oldCoreExtensions = ['ConfirmEdit', 'Gadgets', 'Nuke', 'ParserFunctions',
'Renameuser', 'Vector', 'WikiEditor']
+ oldCoreExtensions = [
+ 'ConfirmEdit',
+ 'Gadgets',
+ 'Nuke',
+ 'ParserFunctions',
+ 'Renameuser',
+ 'Vector',
+ 'WikiEditor',
+ ]
# Export extensions for inclusion
if version > '1.21':
@@ -306,13 +366,15 @@
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 = ['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)
+ gzipProc = subprocess.Popen(['gzip', '-9'], stdin=tarProc.stdout,
+ stdout=outFile)
if tarProc.wait() != 0 or gzipProc.wait() != 0:
print "tar/gzip failed, exiting"
@@ -323,7 +385,8 @@
return targz
-def makeRelease(version, branch, dir, gitRoot, prevVersion=None,
prevBranch=None, extensions=[]):
+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'):
@@ -351,7 +414,8 @@
# Generate the .tar.gz files
outFiles = []
- outFiles.append(makeTarFile(package, 'mediawiki-core-' + version, dir,
rootDir, extExclude))
+ outFiles.append(makeTarFile(package, 'mediawiki-core-' + version, dir,
+ rootDir, extExclude))
outFiles.append(makeTarFile(package, package, dir, rootDir))
# Patch
@@ -362,7 +426,8 @@
for ext in getVersionExtensions(prevVersion, extensions):
exportExtension(branch, ext, prevDir, gitRoot)
- makePatch(dir + '/' + package + '.patch.gz', prevDir, package,
'normal')
+ makePatch(dir + '/' + package + '.patch.gz',
+ prevDir, package, 'normal')
outFiles.append(package + '.patch.gz')
print package + '.patch.gz written'
haveI18n = False
@@ -394,7 +459,8 @@
# Write email template
print
print "Full release notes:"
- url = 'https://git.wikimedia.org/blob/mediawiki%2Fcore.git/' + branch +
'/RELEASE-NOTES'
+ url = ('https://git.wikimedia.org/blob/mediawiki%2Fcore.git/'
+ + branch + '/RELEASE-NOTES')
if dir > '1.17':
url += '-' + dir
@@ -402,26 +468,32 @@
print 'https://www.mediawiki.org/wiki/Release_notes/' + dir
print
print
- print
'**********************************************************************'
+ print '*' * 70
print 'Download:'
- print 'http://download.wikimedia.org/mediawiki/' + dir + '/' + package +
'.tar.gz'
+ 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 ("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
+ 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 ('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 ('http://download.wikimedia.org/mediawiki/'
+ + dir + '/' + fileName + '.sig')
print
print 'Public keys:'
diff --git a/tox.ini b/tox.ini
deleted file mode 100644
index 90c48bd..0000000
--- a/tox.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[flake8]
-; E501 line too long (X > 79 characters)
-ignore=E501
-
-[pep8]
-; E501 line too long (X > 79 characters)
-ignore=E501
--
To view, visit https://gerrit.wikimedia.org/r/82819
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5bccfdfd6298456155562e2508339fb68b57c5b
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: MarkAHershberger <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
