MarkAHershberger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/185657
Change subject: CamelCase away!
......................................................................
CamelCase away!
Everything except class names converted away from camel case
Change-Id: I80dcce18930b3033784b5db3bc8cf03f0bc30bad
---
M make-release/make-release.py
1 file changed, 120 insertions(+), 124 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/57/185657/1
diff --git a/make-release/make-release.py b/make-release/make-release.py
index 86c6864..c549305 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -87,7 +87,7 @@
help='which branch to use (defaults to master for snapshot)'
)
parser.add_argument(
- '--destDir', dest='destDir',
+ '--destDir', dest='dest_dir',
default='/usr/local/share/make-release',
help='where the tarignore (and other files necessary to '
'create a tarball) files are stored. (defaults to '
@@ -116,7 +116,7 @@
"""Abstract out a MediaWiki version"""
def __init__(self, version=None):
- decomposed = self.decomposeVersion(version)
+ decomposed = self.decompose_version(version)
if version is None:
self.raw = 'snapshot-' + time.strftime('%Y%m%d', time.gmtime())
@@ -125,8 +125,8 @@
self.major = decomposed.get('major', 'snapshot')
self.branch = decomposed.get('branch', 'master')
self.tag = decomposed.get('tag', 'master')
- self.prev_version = decomposed.get('prevVersion', None)
- self.prev_tag = decomposed.get('prevTag', None)
+ self.prev_version = decomposed.get('prev_version', None)
+ self.prev_tag = decomposed.get('prev_tag', None)
# alpha / beta / rc ..
self.phase = decomposed.get('phase', None)
@@ -145,7 +145,7 @@
self.branch
)
- def decomposeVersion(self, version):
+ def decompose_version(self, version):
"""Split a version number to branch / major
Whenever a version is recognized, a dict is returned with keys:
@@ -153,8 +153,8 @@
- minor
- branch
- tag
- - prevVersion
- - prevTag
+ - prev_version
+ - prev_tag
When one or more letters are found after the minor version we consider
it a software development phase (ex: alpha, beta, rc) with incremental
@@ -227,8 +227,8 @@
last = m.group(m.lastindex)
if last != '' and int(last) == 0:
- ret['prevVersion'] = None
- ret['prevTag'] = None
+ ret['prev_version'] = None
+ ret['prev_tag'] = None
return ret
bits = [d for d in m.groups('')]
@@ -243,13 +243,13 @@
bits[1] == '0' and
(bits[2] == 'rc' and
bits[3] == '0'))):
- ret['prevVersion'] = '%s.%s%s%s' % tuple(bits)
+ ret['prev_version'] = '%s.%s%s%s' % tuple(bits)
elif 'phase' in ret:
- ret['prevVersion'] = '%s.%s-%s.%s' % tuple(bits)
+ ret['prev_version'] = '%s.%s-%s.%s' % tuple(bits)
else:
- ret['prevVersion'] = '%s.%s' % (bits[0], bits[1])
+ ret['prev_version'] = '%s.%s' % (bits[0], bits[1])
- ret['prevTag'] = 'tags/' + ret['prevVersion']
+ ret['prev_tag'] = 'tags/' + ret['prev_version']
return ret
@@ -304,29 +304,29 @@
# No version specified, assuming a snapshot release
if options.version is None:
- self.makeRelease(
+ self.make_release(
version=MwVersion(),
dir='snapshots')
return 0
if options.smw:
- smwExtensions = bundles.get('smw', None)
- if smwExtensions is None:
+ smw_extensions = bundles.get('smw', None)
+ if smw_extensions is None:
raise Exception("No SMW extensions given.")
# Other extensions for inclusion
- for ext in smwExtensions:
+ for ext in smw_extensions:
extensions.append(ext)
if options.previousversion:
# Given the previous version on the command line
- self.makeRelease(
+ self.make_release(
extensions=extensions,
version=self.version,
dir=self.version.major)
return 0
- noPrevious = False
+ no_previous = False
if self.version.prev_version is None:
if not self.ask("No previous release found. Do you want to make a "
"release with no patch?"):
@@ -334,9 +334,9 @@
'on the command line')
return 1
else:
- noPrevious = True
- if noPrevious or options.no_previous:
- self.makeRelease(
+ no_previous = True
+ if no_previous or options.no_previous:
+ self.make_release(
extensions=extensions,
version=self.version,
dir=self.version.major)
@@ -347,7 +347,7 @@
'on the command line')
return 1
- self.makeRelease(
+ self.make_release(
extensions=extensions,
version=self.version,
dir=options.buildroot)
@@ -367,8 +367,8 @@
return False
print('Please type "y" for yes or "n" for no')
- def getGit(self, repo, dir, label, branch):
- oldDir = os.getcwd()
+ def get_git(self, repo, dir, label, branch):
+ old_dir = os.getcwd()
if os.path.exists(repo):
logging.debug("Updating local %s", repo)
proc = subprocess.Popen(['git', 'remote', 'update'],
@@ -400,17 +400,17 @@
logging.error("git checkout failed, exiting")
sys.exit(1)
- os.chdir(oldDir)
+ os.chdir(old_dir)
- def patchExport(self, patch, dir):
+ def patch_export(self, patch, dir):
- gitRoot = self.options.gitroot
+ git_root = self.options.gitroot
os.chdir(dir)
logging.debug("Applying patch %s", patch)
# git fetch the reference from Gerrit and cherry-pick it
- proc = subprocess.Popen(['git', 'fetch', gitRoot + '/core', patch,
+ proc = subprocess.Popen(['git', 'fetch', git_root + '/core', patch,
'&&', 'git', 'cherry-pick', 'FETCH_HEAD'])
if proc.wait() != 0:
@@ -420,26 +420,26 @@
os.chdir('..')
logging.info('Done with applying patch %s', patch)
- def export(self, tag, module, exportDir):
+ def export(self, tag, module, export_dir):
- gitRoot = self.options.gitroot
+ git_root = self.options.gitroot
- dir = exportDir + '/' + module
- self.getGit(gitRoot + '/core', dir, "core", tag)
+ dir = export_dir + '/' + module
+ self.get_git(git_root + '/core', dir, "core", tag)
logging.info('Done with exporting core')
- def exportExtension(self, branch, extension, dir):
+ def export_extension(self, branch, extension, dir):
gitroot = self.options.gitroot
if self.options.gitrootext:
gitroot = self.options.gitrootext
- self.getGit(gitroot + '/extensions/' + extension,
+ self.get_git(gitroot + '/extensions/' + extension,
dir + '/extensions/' + extension, extension, branch)
logging.info('Done with exporting %s', extension)
- def makePatch(self, destDir, patchFileName, dir1, dir2, type):
- patchFile = open(destDir + "/" + patchFileName, 'w')
+ def make_patch(self, dest_dir, patch_filename, dir1, dir2, type):
+ patch_file = open(dest_dir + "/" + patch_filename, 'w')
args = ['diff', '-Nruw']
if type == 'i18n':
logging.debug("Generating i18n patch file...")
@@ -452,72 +452,72 @@
args.extend([dir1, dir2])
logging.debug(' '.join(args))
- diffProc = subprocess.Popen(args, stdout=subprocess.PIPE)
- gzipProc = subprocess.Popen(['gzip', '-9'], stdin=diffProc.stdout,
- stdout=patchFile)
+ diff_proc = subprocess.Popen(args, stdout=subprocess.PIPE)
+ gzip_proc = subprocess.Popen(['gzip', '-9'], stdin=diff_proc.stdout,
+ stdout=patch_file)
- diffStatus = diffProc.wait()
- gzipStatus = gzipProc.wait()
+ diff_status = diff_proc.wait()
+ gzip_status = gzip_proc.wait()
- if diffStatus > 1 or gzipStatus != 0:
+ if diff_status > 1 or gzip_status != 0:
logging.error("diff failed, exiting")
- logging.error("diff: %s", diffStatus)
- logging.error("gzip: %s", gzipStatus)
+ logging.error("diff: %s", diff_status)
+ logging.error("gzip: %s", gzip_status)
sys.exit(1)
- patchFile.close()
+ patch_file.close()
logging.info('Done with making patch')
- return diffStatus == 1
+ return diff_status == 1
- def makeTarFile(self, package, targetDir, dir, argAdd=[]):
+ def make_tar_file(self, package, target_dir, dir, arg_add=[]):
tar = self.options.tar_command
# Generate the .tar.gz file
filename = package + '.tar.gz'
- outFile = open(dir + '/' + filename, "w")
+ out_file = open(dir + '/' + filename, "w")
args = [tar, '--format=gnu', '--exclude-vcs', '-C', dir]
if self.config.get('tar', {}).get('ignore', []):
for patt in self.config['tar']['ignore']:
args += ['--exclude', patt]
- args += argAdd
- args += ['-c', targetDir]
+ args += arg_add
+ args += ['-c', target_dir]
logging.debug("Creating %s", filename)
- tarProc = subprocess.Popen(args, stdout=subprocess.PIPE)
- gzipProc = subprocess.Popen(['gzip', '-9'], stdin=tarProc.stdout,
- stdout=outFile)
+ tar_proc = subprocess.Popen(args, stdout=subprocess.PIPE)
+ gzip_proc = subprocess.Popen(['gzip', '-9'], stdin=tar_proc.stdout,
+ stdout=out_file)
- if tarProc.wait() != 0 or gzipProc.wait() != 0:
+ if tar_proc.wait() != 0 or gzip_proc.wait() != 0:
logging.error("tar/gzip failed, exiting")
sys.exit(1)
- outFile.close()
+ out_file.close()
logging.info('%s written', filename)
return filename
- def makeRelease(self, version, dir, extensions=[]):
- rootDir = self.options.buildroot
+ def make_release(self, version, dir, extensions=[]):
+ root_dir = self.options.buildroot
# variables related to the version
branch = self.version.branch
tag = self.version.tag
- prevVersion = self.version.prev_version
+ prev_version = self.version.prev_version
- if rootDir is None:
- rootDir = os.getcwd()
+ if root_dir is None:
+ root_dir = os.getcwd()
- if not os.path.exists(rootDir):
- logging.debug('Creating %s', rootDir)
- os.mkdir(rootDir)
+ if not os.path.exists(root_dir):
+ logging.debug('Creating %s', root_dir)
+ os.mkdir(root_dir)
- buildDir = rootDir + '/build'
- uploadDir = rootDir + '/uploads'
+ build_dir = root_dir + '/build'
+ upload_dir = root_dir + '/uploads'
- if not os.path.exists(buildDir):
- logging.debug('Creating build dir: %s', buildDir)
- os.mkdir(buildDir)
- if not os.path.exists(uploadDir):
- logging.debug('Creating uploads dir: %s', uploadDir)
- os.mkdir(uploadDir)
+ if not os.path.exists(build_dir):
+ logging.debug('Creating build dir: %s', build_dir)
+ os.mkdir(build_dir)
+ if not os.path.exists(upload_dir):
+ logging.debug('Creating uploads dir: %s', upload_dir)
+ os.mkdir(upload_dir)
- os.chdir(buildDir)
+ os.chdir(build_dir)
if not os.path.exists(dir):
os.mkdir(dir)
@@ -525,65 +525,61 @@
package = 'mediawiki-' + version.raw
# Export the target
- self.export(tag, package, buildDir)
+ self.export(tag, package, build_dir)
- patchRevisions = []
- for patch in patchRevisions:
- self.patchExport(patch, package)
-
- extExclude = []
+ ext_exclude = []
for ext in self.get_extensions_for_version(version, extensions):
- self.exportExtension(branch, ext, package)
- extExclude.append("--exclude")
- extExclude.append("extensions/" + ext)
+ self.export_extension(branch, ext, package)
+ ext_exclude.append("--exclude")
+ ext_exclude.append("extensions/" + ext)
# Generate the .tar.gz files
- outFiles = []
- outFiles.append(
- self.makeTarFile(
+ out_files = []
+ out_files.append(
+ self.make_tar_file(
package='mediawiki-core-' + version.raw,
- targetDir=package,
- dir=buildDir,
- argAdd=extExclude)
+ target_dir=package,
+ dir=build_dir,
+ arg_add=ext_exclude)
)
- outFiles.append(
- self.makeTarFile(
+ out_files.append(
+ self.make_tar_file(
package=package,
- targetDir=package,
- dir=buildDir)
+ target_dir=package,
+ dir=build_dir)
)
# Patch
- haveI18n = False
- if not self.options.no_previous and prevVersion is not None:
- prevDir = 'mediawiki-' + prevVersion
- prevMwVersion = MwVersion(prevVersion)
- self.export(prevMwVersion.tag,
- prevDir, buildDir)
+ have_i18n = False
+ if not self.options.no_previous and prev_version is not None:
+ prev_dir = 'mediawiki-' + prev_version
+ prev_mwversion = MwVersion(prev_version)
+ self.export(prev_mwversion.tag,
+ prev_dir, build_dir)
- for ext in self.get_extensions_for_version(prevMwVersion,
+ for ext in self.get_extensions_for_version(prev_mwversion,
extensions):
- self.exportExtension(branch, ext, prevDir)
+ self.export_extension(branch, ext, prev_dir)
- self.makePatch(
- buildDir, package + '.patch.gz', prevDir, package, 'normal')
- outFiles.append(package + '.patch.gz')
+ self.make_patch(
+ build_dir, package + '.patch.gz', prev_dir, package, 'normal')
+ out_files.append(package + '.patch.gz')
logging.debug('%s.patch.gz written', package)
if os.path.exists(package + '/languages/messages'):
- i18nPatch = 'mediawiki-i18n-' + version.raw + '.patch.gz'
- if (self.makePatch(
- buildDir, i18nPatch, prevDir, package, 'i18n')):
- outFiles.append(i18nPatch)
- logging.info('%s written', i18nPatch)
- haveI18n = True
+ i18n_patch = 'mediawiki-i18n-' + version.raw + '.patch.gz'
+ if (self.make_patch(
+ build_dir, i18n_patch, prev_dir, package, 'i18n')):
+ out_files.append(i18n_patch)
+ logging.info('%s written', i18n_patch)
+ have_i18n = True
# Sign
- uploadFiles = []
- for fileName in outFiles:
+ upload_files = []
+ for file_name in out_files:
if options.sign:
try:
proc = subprocess.Popen([
- 'gpg', '--detach-sign', buildDir + '/' + fileName])
+ 'gpg', '--detach-sign', build_dir + '/' + file_name])
except OSError as e:
logging.error("gpg failed, does it exist? Skip with " +
"--dont-sign.")
@@ -592,14 +588,14 @@
if proc.wait() != 0:
logging.error("gpg failed, exiting")
sys.exit(1)
- uploadFiles.append(fileName + '.sig')
- uploadFiles.append(fileName)
+ upload_files.append(file_name + '.sig')
+ upload_files.append(file_name)
# Generate upload tarball
tar = self.options.tar_command
- args = [tar, '-C', buildDir,
- '-cf', uploadDir + '/upload-' + version.raw + '.tar']
- args.extend(uploadFiles)
+ args = [tar, '-C', build_dir,
+ '-cf', upload_dir + '/upload-' + version.raw + '.tar']
+ args.extend(upload_files)
proc = subprocess.Popen(args)
if proc.wait() != 0:
logging.error("Failed to generate upload.tar")
@@ -624,25 +620,25 @@
+ dir + '/' + package + '.tar.gz')
print()
- if prevVersion is not None:
- if haveI18n:
- print("Patch to previous version (" + prevVersion
+ if prev_version is not None:
+ if have_i18n:
+ print("Patch to previous version (" + prev_version
+ "), 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)
+ + dir + '/' + i18n_patch)
else:
- print("Patch to previous version (" + prevVersion + "):")
+ print("Patch to previous version (" + prev_version + "):")
print('http://download.wikimedia.org/mediawiki/'
+ dir + '/' + package + '.patch.gz')
print()
print('GPG signatures:')
- for fileName in outFiles:
+ for file_name in out_files:
print('http://download.wikimedia.org/mediawiki/'
- + dir + '/' + fileName + '.sig')
+ + dir + '/' + file_name + '.sig')
print()
print('Public keys:')
--
To view, visit https://gerrit.wikimedia.org/r/185657
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I80dcce18930b3033784b5db3bc8cf03f0bc30bad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
