2014-09-04 09:45:53 +00:00
|
|
|
#! env python
|
|
|
|
import json
|
|
|
|
import os
|
2014-09-05 09:23:21 +00:00
|
|
|
import sys
|
2014-09-04 09:45:53 +00:00
|
|
|
import semantic_version
|
|
|
|
import git
|
|
|
|
import json
|
|
|
|
import requests
|
|
|
|
import getpass
|
|
|
|
import argparse
|
|
|
|
import re
|
|
|
|
from requests.auth import HTTPBasicAuth
|
|
|
|
import requests.exceptions
|
|
|
|
from time import sleep
|
2016-03-15 11:27:48 +00:00
|
|
|
from .config.common_site_config import get_config
|
2016-04-08 09:25:49 +00:00
|
|
|
import click
|
2016-03-15 11:27:48 +00:00
|
|
|
|
2014-09-04 09:45:53 +00:00
|
|
|
github_username = None
|
|
|
|
github_password = None
|
|
|
|
|
2016-06-09 10:09:54 +00:00
|
|
|
def release(bench_path, app, bump_type, develop='develop', master='master',
|
|
|
|
remote='upstream', owner='frappe', repo_name=None):
|
|
|
|
|
|
|
|
validate(bench_path)
|
|
|
|
|
|
|
|
bump(bench_path, app, bump_type, develop=develop, master=master, owner=owner,
|
|
|
|
repo_name=repo_name, remote=remote)
|
|
|
|
|
|
|
|
def validate(bench_path):
|
2016-07-25 09:34:55 +00:00
|
|
|
config = get_config(bench_path)
|
|
|
|
if not config.get('release_bench'):
|
2016-04-08 09:25:49 +00:00
|
|
|
print 'bench not configured to release'
|
|
|
|
sys.exit(1)
|
2016-06-09 10:09:54 +00:00
|
|
|
|
2016-04-08 09:25:49 +00:00
|
|
|
global github_username, github_password
|
2016-07-25 09:34:55 +00:00
|
|
|
|
|
|
|
github_username = config.get('github_username')
|
|
|
|
github_password = config.get('github_password')
|
|
|
|
|
|
|
|
if not github_username:
|
|
|
|
github_username = raw_input('Username: ')
|
|
|
|
|
|
|
|
if not github_password:
|
|
|
|
github_password = getpass.getpass()
|
2016-06-09 10:09:54 +00:00
|
|
|
|
2016-04-08 09:25:49 +00:00
|
|
|
r = requests.get('https://api.github.com/user', auth=HTTPBasicAuth(github_username, github_password))
|
|
|
|
r.raise_for_status()
|
2016-05-17 13:10:21 +00:00
|
|
|
|
2016-06-09 10:09:54 +00:00
|
|
|
def bump(bench_path, app, bump_type, develop, master, remote, owner, repo_name=None):
|
|
|
|
assert bump_type in ['minor', 'major', 'patch', 'stable', 'prerelease']
|
|
|
|
|
|
|
|
repo_path = os.path.join(bench_path, 'apps', app)
|
|
|
|
update_branches_and_check_for_changelog(repo_path, develop, master, remote=remote)
|
|
|
|
message = get_release_message(repo_path, develop=develop, master=master, remote=remote)
|
2016-04-06 10:29:52 +00:00
|
|
|
|
2016-04-08 09:25:49 +00:00
|
|
|
if not message:
|
|
|
|
print 'No commits to release'
|
|
|
|
return
|
2016-04-06 10:29:52 +00:00
|
|
|
|
2016-04-08 09:25:49 +00:00
|
|
|
print
|
|
|
|
print message
|
|
|
|
print
|
2014-09-04 09:45:53 +00:00
|
|
|
|
2016-04-08 09:25:49 +00:00
|
|
|
click.confirm('Do you want to continue?', abort=True)
|
2014-09-04 09:45:53 +00:00
|
|
|
|
2016-06-09 10:09:54 +00:00
|
|
|
new_version = bump_repo(repo_path, bump_type, develop=develop, master=master)
|
|
|
|
commit_changes(repo_path, new_version)
|
|
|
|
tag_name = create_release(repo_path, new_version, develop=develop, master=master)
|
|
|
|
push_release(repo_path, develop=develop, master=master, remote=remote)
|
|
|
|
create_github_release(repo_path, tag_name, message, remote=remote, owner=owner, repo_name=repo_name)
|
|
|
|
print 'Released {tag} for {repo_path}'.format(tag=tag_name, repo_path=repo_path)
|
2016-04-08 09:25:49 +00:00
|
|
|
|
2016-06-09 10:09:54 +00:00
|
|
|
def update_branches_and_check_for_changelog(repo_path, develop='develop', master='master', remote='upstream'):
|
2016-05-17 13:10:21 +00:00
|
|
|
|
2016-06-09 10:09:54 +00:00
|
|
|
update_branch(repo_path, master, remote=remote)
|
|
|
|
update_branch(repo_path, develop, remote=remote)
|
2016-04-15 05:51:26 +00:00
|
|
|
if develop != 'develop':
|
2016-06-09 10:09:54 +00:00
|
|
|
update_branch(repo_path, 'develop', remote=remote)
|
2016-05-17 13:10:21 +00:00
|
|
|
|
2016-06-09 10:09:54 +00:00
|
|
|
git.Repo(repo_path).git.checkout(develop)
|
|
|
|
check_for_unmerged_changelog(repo_path)
|
2014-09-04 09:45:53 +00:00
|
|
|
|
2016-06-09 10:09:54 +00:00
|
|
|
def update_branch(repo_path, branch, remote):
|
2016-04-08 09:25:49 +00:00
|
|
|
print "updating local branch of", repo_path, 'using', remote + '/' + branch
|
|
|
|
|
2014-09-04 09:45:53 +00:00
|
|
|
repo = git.Repo(repo_path)
|
|
|
|
g = repo.git
|
|
|
|
g.fetch(remote)
|
|
|
|
g.checkout(branch)
|
2016-04-08 09:25:49 +00:00
|
|
|
g.reset('--hard', remote+'/'+branch)
|
|
|
|
|
2016-06-09 10:09:54 +00:00
|
|
|
def check_for_unmerged_changelog(repo_path):
|
|
|
|
current = os.path.join(repo_path, os.path.basename(repo_path), 'change_log', 'current')
|
2016-04-08 09:25:49 +00:00
|
|
|
if os.path.exists(current) and [f for f in os.listdir(current) if f != "readme.md"]:
|
2016-06-09 10:09:54 +00:00
|
|
|
raise Exception("Unmerged change log! in " + repo_path)
|
2016-04-08 09:25:49 +00:00
|
|
|
|
2016-06-09 10:09:54 +00:00
|
|
|
def get_release_message(repo_path, develop='develop', master='master', remote='upstream'):
|
|
|
|
print 'getting release message for', repo_path, 'comparing', master, '...', develop
|
2016-05-17 13:10:21 +00:00
|
|
|
|
2016-04-08 09:25:49 +00:00
|
|
|
repo = git.Repo(repo_path)
|
|
|
|
g = repo.git
|
2016-06-09 10:09:54 +00:00
|
|
|
log = g.log('{remote}/{master}..{remote}/{develop}'.format(
|
|
|
|
remote=remote, master=master, develop=develop), '--format=format:%s', '--no-merges')
|
|
|
|
|
2016-04-08 09:25:49 +00:00
|
|
|
if log:
|
|
|
|
return "* " + log.replace('\n', '\n* ')
|
|
|
|
|
2016-06-09 10:09:54 +00:00
|
|
|
def bump_repo(repo_path, bump_type, develop='develop', master='master'):
|
|
|
|
current_version = get_current_version(repo_path)
|
2016-04-08 09:25:49 +00:00
|
|
|
new_version = get_bumped_version(current_version, bump_type)
|
|
|
|
|
|
|
|
print 'bumping version from', current_version, 'to', new_version
|
|
|
|
|
2016-06-09 10:09:54 +00:00
|
|
|
set_version(repo_path, new_version)
|
2016-04-08 09:25:49 +00:00
|
|
|
return new_version
|
|
|
|
|
2016-06-09 10:09:54 +00:00
|
|
|
def get_current_version(repo_path):
|
|
|
|
# TODO clean this up!
|
|
|
|
filename = os.path.join(repo_path, os.path.basename(repo_path), '__init__.py')
|
2016-04-08 09:25:49 +00:00
|
|
|
with open(filename) as f:
|
|
|
|
contents = f.read()
|
2016-06-09 10:09:54 +00:00
|
|
|
match = re.search(r"^(\s*%s\s*=\s*['\\\"])(.+?)(['\"])(?sm)" % '__version__',
|
2016-04-08 09:25:49 +00:00
|
|
|
contents)
|
|
|
|
return match.group(2)
|
2014-09-04 09:45:53 +00:00
|
|
|
|
|
|
|
def get_bumped_version(version, bump_type):
|
|
|
|
v = semantic_version.Version(version)
|
|
|
|
if bump_type == 'minor':
|
|
|
|
v.minor += 1
|
|
|
|
v.patch = 0
|
2016-06-09 10:09:54 +00:00
|
|
|
v.prerelease = None
|
|
|
|
|
2014-09-04 09:45:53 +00:00
|
|
|
elif bump_type == 'major':
|
|
|
|
v.major += 1
|
|
|
|
v.minor = 0
|
|
|
|
v.patch = 0
|
2016-06-09 10:09:54 +00:00
|
|
|
v.prerelease = None
|
|
|
|
|
2014-09-04 09:45:53 +00:00
|
|
|
elif bump_type == 'patch':
|
|
|
|
v.patch += 1
|
2016-06-09 10:09:54 +00:00
|
|
|
v.prerelease = None
|
|
|
|
|
|
|
|
elif bump_type == 'stable':
|
|
|
|
# remove pre-release tag
|
|
|
|
v.prerelease = None
|
2014-09-04 09:45:53 +00:00
|
|
|
|
2016-06-09 10:09:54 +00:00
|
|
|
elif bump_type == 'prerelease':
|
|
|
|
if v.prerelease == None:
|
|
|
|
v.prerelease = ('beta',)
|
2016-04-08 09:25:49 +00:00
|
|
|
|
2016-06-09 10:09:54 +00:00
|
|
|
elif len(v.prerelease)==1:
|
|
|
|
v.prerelease[1] = '1'
|
2016-04-08 09:25:49 +00:00
|
|
|
|
2016-06-09 10:09:54 +00:00
|
|
|
else:
|
|
|
|
v.prerelease[1] = str(int(v.prerelease[1]) + 1)
|
|
|
|
|
|
|
|
return unicode(v)
|
2016-04-08 09:25:49 +00:00
|
|
|
|
2016-06-09 10:09:54 +00:00
|
|
|
def set_version(repo_path, version):
|
|
|
|
set_filename_version(os.path.join(repo_path, os.path.basename(repo_path),'__init__.py'), version, '__version__')
|
|
|
|
|
|
|
|
# TODO fix this
|
|
|
|
# set_setuppy_version(repo_path, version)
|
|
|
|
# set_versionpy_version(repo_path, version)
|
|
|
|
# set_hooks_version(repo_path, version)
|
|
|
|
|
|
|
|
# def set_setuppy_version(repo_path, version):
|
|
|
|
# set_filename_version(os.path.join(repo_path, 'setup.py'), version, 'version')
|
|
|
|
#
|
|
|
|
# def set_versionpy_version(repo_path, version):
|
|
|
|
# set_filename_version(os.path.join(repo_path, os.path.basename(repo_path),'__version__.py'), version, '__version__')
|
|
|
|
#
|
|
|
|
# def set_hooks_version(repo_path, version):
|
|
|
|
# set_filename_version(os.path.join(repo_path, os.path.basename(repo_path),'hooks.py'), version, 'app_version')
|
2014-09-04 09:45:53 +00:00
|
|
|
|
|
|
|
def set_filename_version(filename, version_number, pattern):
|
|
|
|
changed = []
|
|
|
|
|
|
|
|
def inject_version(match):
|
|
|
|
before, old, after = match.groups()
|
|
|
|
changed.append(True)
|
|
|
|
return before + version_number + after
|
|
|
|
|
|
|
|
with open(filename) as f:
|
|
|
|
contents = re.sub(r"^(\s*%s\s*=\s*['\\\"])(.+?)(['\"])(?sm)" % pattern,
|
|
|
|
inject_version, f.read())
|
|
|
|
|
|
|
|
if not changed:
|
|
|
|
raise Exception('Could not find %s in %s', pattern, filename)
|
|
|
|
|
|
|
|
with open(filename, 'w') as f:
|
|
|
|
f.write(contents)
|
|
|
|
|
2016-06-09 10:09:54 +00:00
|
|
|
def commit_changes(repo_path, new_version):
|
2016-04-08 09:25:49 +00:00
|
|
|
print 'committing version change to', repo_path
|
2014-09-04 09:45:53 +00:00
|
|
|
|
2016-04-08 09:25:49 +00:00
|
|
|
repo = git.Repo(repo_path)
|
2016-06-09 10:09:54 +00:00
|
|
|
app_name = os.path.basename(repo_path)
|
|
|
|
repo.index.add([os.path.join(app_name, '__init__.py')])
|
|
|
|
repo.index.commit('bumped to version {}'.format(new_version))
|
2016-05-17 13:10:21 +00:00
|
|
|
|
2016-06-09 10:09:54 +00:00
|
|
|
def create_release(repo_path, new_version, develop='develop', master='master'):
|
|
|
|
print 'creating release for version', new_version
|
2016-04-08 09:25:49 +00:00
|
|
|
repo = git.Repo(repo_path)
|
|
|
|
g = repo.git
|
2016-06-09 10:09:54 +00:00
|
|
|
g.checkout(master)
|
|
|
|
try:
|
|
|
|
g.merge(develop, '--no-ff')
|
|
|
|
except git.exc.GitCommandError, e:
|
|
|
|
handle_merge_error(e, source=develop, target=master)
|
|
|
|
|
|
|
|
tag_name = 'v' + new_version
|
|
|
|
repo.create_tag(tag_name, message='Release {}'.format(new_version))
|
|
|
|
g.checkout(develop)
|
|
|
|
|
|
|
|
try:
|
|
|
|
g.merge(master)
|
|
|
|
except git.exc.GitCommandError, e:
|
|
|
|
handle_merge_error(e, source=master, target=develop)
|
|
|
|
|
|
|
|
if develop != 'develop':
|
2016-04-08 09:25:49 +00:00
|
|
|
print 'merging master into develop'
|
|
|
|
g.checkout('develop')
|
2016-06-09 10:09:54 +00:00
|
|
|
try:
|
|
|
|
g.merge(master)
|
|
|
|
except git.exc.GitCommandError, e:
|
|
|
|
handle_merge_error(e, source=master, target='develop')
|
2015-06-08 09:17:25 +00:00
|
|
|
|
2016-04-08 09:25:49 +00:00
|
|
|
return tag_name
|
2014-09-04 09:45:53 +00:00
|
|
|
|
2016-06-09 10:09:54 +00:00
|
|
|
def handle_merge_error(e, source, target):
|
|
|
|
print '-'*80
|
|
|
|
print 'Error when merging {source} into {target}'.format(source=source, target=target)
|
|
|
|
print e
|
|
|
|
print 'You can open a new terminal, try to manually resolve the conflict/error and continue'
|
|
|
|
print '-'*80
|
|
|
|
click.confirm('Have you manually resolved the error?', abort=True)
|
2016-05-17 13:10:21 +00:00
|
|
|
|
2016-06-09 10:09:54 +00:00
|
|
|
def push_release(repo_path, develop='develop', master='master', remote='upstream'):
|
|
|
|
print 'pushing branches', master, develop, 'of', repo_path
|
2015-05-21 16:02:47 +00:00
|
|
|
repo = git.Repo(repo_path)
|
|
|
|
g = repo.git
|
2016-04-15 05:51:26 +00:00
|
|
|
args = [
|
2016-06-09 10:09:54 +00:00
|
|
|
'{master}:{master}'.format(master=master),
|
|
|
|
'{develop}:{develop}'.format(develop=develop)
|
2016-04-15 05:51:26 +00:00
|
|
|
]
|
2016-06-09 10:09:54 +00:00
|
|
|
|
|
|
|
if develop != 'develop':
|
2016-04-15 05:51:26 +00:00
|
|
|
print 'pushing develop branch of', repo_path
|
|
|
|
args.append('develop:develop')
|
2016-06-09 10:09:54 +00:00
|
|
|
|
2016-04-15 05:51:26 +00:00
|
|
|
args.append('--tags')
|
2015-05-21 16:02:47 +00:00
|
|
|
|
2016-06-09 10:09:54 +00:00
|
|
|
print g.push(remote, *args)
|
|
|
|
|
|
|
|
def create_github_release(repo_path, tag_name, message, remote='upstream', owner='frappe', repo_name=None,
|
|
|
|
gh_username=None, gh_password=None):
|
2016-05-17 13:10:21 +00:00
|
|
|
|
2016-04-08 09:25:49 +00:00
|
|
|
print 'creating release on github'
|
2014-09-04 09:45:53 +00:00
|
|
|
|
|
|
|
global github_username, github_password
|
2016-04-08 09:25:49 +00:00
|
|
|
if not (gh_username and gh_password):
|
|
|
|
if not (github_username and github_password):
|
|
|
|
raise Exception, "No credentials"
|
|
|
|
gh_username = github_username
|
|
|
|
gh_password = github_password
|
2016-06-09 10:09:54 +00:00
|
|
|
|
|
|
|
repo_name = repo_name or os.path.basename(repo_path)
|
2016-04-08 09:25:49 +00:00
|
|
|
data = {
|
|
|
|
'tag_name': tag_name,
|
|
|
|
'target_commitish': 'master',
|
|
|
|
'name': 'Release ' + tag_name,
|
2016-06-09 10:09:54 +00:00
|
|
|
'body': message,
|
2016-04-08 09:25:49 +00:00
|
|
|
'draft': False,
|
|
|
|
'prerelease': False
|
|
|
|
}
|
|
|
|
for i in xrange(3):
|
|
|
|
try:
|
2016-06-09 10:09:54 +00:00
|
|
|
r = requests.post('https://api.github.com/repos/{owner}/{repo_name}/releases'.format(
|
|
|
|
owner=owner, repo_name=repo_name),
|
|
|
|
auth=HTTPBasicAuth(gh_username, gh_password), data=json.dumps(data))
|
2016-04-08 09:25:49 +00:00
|
|
|
r.raise_for_status()
|
|
|
|
break
|
|
|
|
except requests.exceptions.HTTPError:
|
|
|
|
print 'request failed, retrying....'
|
|
|
|
sleep(3*i + 1)
|
|
|
|
if i !=2:
|
|
|
|
continue
|
|
|
|
else:
|
|
|
|
print r.json()
|
|
|
|
raise
|
|
|
|
return r
|
2014-09-04 09:45:53 +00:00
|
|
|
|