MarkAHershberger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/81240
Change subject: expose fixed makeRelease parameters to cli args flake8/pep8
clean
......................................................................
expose fixed makeRelease parameters to cli args
flake8/pep8 clean
Change-Id: Iba2b2fc9cbbe30ffd1bd79688b302ca2460e7427
---
M make-release/make-release
1 file changed, 30 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/40/81240/1
diff --git a/make-release/make-release b/make-release/make-release
index a0554cf..3b8ed73 100755
--- a/make-release/make-release
+++ b/make-release/make-release
@@ -1,5 +1,5 @@
#!/usr/bin/python
-# vim:sw=4:ts=4:et:
+# vim:sw = 4:ts=4:et:
import getopt
import hashlib
@@ -14,7 +14,7 @@
print """
Usage:
./make-release --snapshot
- ./make-release [--yes] [--no-previous] <next-version> [<previous-version>]
+ ./make-release [--help] [--snapshot] [--git-root = URL] [--smw] [--mw-root =
DIR] [--mw-branch = BRANCH] [--yes] [--no-previous] <next-version>
[<previous-version>]
Example:
./make-release 1.19.0
@@ -30,11 +30,13 @@
def main():
try:
- options, args = getopt.getopt(sys.argv[1:], '', ['help', 'snapshot',
'yes', 'no-previous', 'git-root=', 'smw'])
+ options, args = getopt.getopt(sys.argv[1:], '', ['help', 'snapshot',
'yes', 'no-previous', 'git-root = ', 'smw', 'mw-root = ', 'mw-branch = '])
except getopt.GetoptError, err:
print str(err)
dieUsage()
+ mwRootDir = None
+ mwBranch = None
extensions = []
smwExtensions = [
"SemanticMediaWiki", "SemanticResultFormats", "SemanticForms",
@@ -60,6 +62,10 @@
gitRoot = value
elif name == '--smw':
smw = True
+ elif name == '--mw-root':
+ mwRootDir = value
+ elif name == '--mw-branch':
+ mwBranch = value
# Snapshot release?
if snapshot:
@@ -74,12 +80,18 @@
if len(args) == 0:
dieUsage()
- decomposed = decomposeVersion(args[0])
+ version = args[0]
+
+ decomposed = decomposeVersion(version)
if decomposed is None:
- print 'Invalid version number "%s"' % (args[0])
+ print 'Invalid version number "%s"' % (version)
sys.exit(1)
- version = decomposed['major']
+ if mwRootDir is None:
+ mwRootDir = decomposed['major']
+
+ if mwBranch is None:
+ mwBranch = decomposed['branch']
if smw:
# Other extensions for inclusion
@@ -90,16 +102,16 @@
# Given the previous version on the command line
makeRelease(
extensions=extensions,
- version=args[0],
+ version=version,
prevVersion=args[1],
prevBranch=versionToBranch(args[1]),
- branch=decomposed['branch'],
- dir=decomposed['major'],
+ branch=mwBranch,
+ dir=mwRootDir,
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?"):
+ if not yes and 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:
@@ -108,22 +120,22 @@
if noPrevious:
makeRelease(
extensions=extensions,
- version=args[0],
- branch=decomposed['branch'],
- dir=decomposed['major'],
+ version=version,
+ branch=mwBranch,
+ dir=mwRootDir,
gitRoot=gitRoot)
else:
- if not ask("Was %s the previous release?" %
(decomposed['prevVersion'])):
+ if not yes and 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],
+ version=version,
prevVersion=decomposed['prevVersion'],
prevBranch=decomposed['prevBranch'],
- branch=decomposed['branch'],
- dir=decomposed['major'],
+ branch=mwBranch,
+ dir=mwRootDir,
gitRoot=gitRoot)
@@ -294,7 +306,7 @@
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)
--
To view, visit https://gerrit.wikimedia.org/r/81240
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba2b2fc9cbbe30ffd1bd79688b302ca2460e7427
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger <mhershber...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
