Skip to content

Commit

Permalink
Merge c14e310 into 8bbd737
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvidalgarcia
mvidalgarcia committed Aug 6, 2020
2 parents 8bbd737 + c14e310 commit 347b980
Show file tree
Hide file tree
Showing 2 changed files with 187 additions and 30 deletions.
148 changes: 118 additions & 30 deletions reana/reana_dev/git.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@
)
from reana.reana_dev.utils import (
display_message,
fetch_latest_pypi_version,
get_srcdir,
run_command,
select_components,
update_module_in_cluster_components,
)


Expand Down Expand Up @@ -676,7 +678,7 @@ def git_push(component): # noqa: D301
run_command(cmd, component)


@git_commands.command(name="git-shared-modules-upgrade")
@git_commands.command(name="git-upgrade-shared-modules")
@click.option(
"--commit-and-publish",
is_flag=True,
Expand All @@ -686,33 +688,8 @@ def git_push(component): # noqa: D301
' "installation: shared packages version bump" message will'
" be created for all affected CLUSTER components.",
)
def git_shared_modules_upgrade(commit_and_publish):
"""Upgrade all cluster components to latest REANA-Commons version."""

def _fetch_latest_pypi_version(package):
"""Fetch latest released version of a package."""
import requests

pypi_rc_info = requests.get(
"https://pypi.python.org/pypi/{}/json".format(package)
)
return sorted(pypi_rc_info.json()["releases"].keys())[-1]

def _update_module_in_cluster_components(module, new_version):
"""Update the specified module version in all affected components."""
components_to_update = {
"reana-commons": COMPONENTS_USING_SHARED_MODULE_COMMONS,
"reana-db": COMPONENTS_USING_SHARED_MODULE_DB,
}
for component in components_to_update[module]:
update_setup_py_dep_cmd = (
'LN=`cat setup.py | grep -n -e "{module}.*>=" | cut -f1 -d: `'
'&& sed -i.bk "`echo $LN`s/>=.*,</>={new_version},</" '
"setup.py && rm setup.py.bk".format(
module=module, new_version=new_version
)
)
run_command(update_setup_py_dep_cmd, component)
def git_upgrade_shared_modules(commit_and_publish):
"""Upgrade all cluster components to latest REANA-Commons/DB version."""

def _commit_and_publish_version_bumps(components):
"""Create commit and version bump PRs for all specified components."""
Expand Down Expand Up @@ -743,8 +720,8 @@ def _commit_and_publish_version_bumps(components):
).union(set(COMPONENTS_USING_SHARED_MODULE_COMMONS))

for module in REPO_LIST_SHARED:
last_version = _fetch_latest_pypi_version(module)
_update_module_in_cluster_components(module, last_version)
last_version = fetch_latest_pypi_version(module)
update_module_in_cluster_components(module, last_version)
click.secho(
"✅ {module} updated to: {last_version}".format(
module=module, last_version=last_version
Expand All @@ -767,4 +744,115 @@ def _commit_and_publish_version_bumps(components):
)


@git_commands.command(name="git-upgrade-common-modules")
@click.option(
"--component",
"-c",
multiple=True,
default=["CLUSTER", "CLIENT"],
help="Which components? [shortname|name|.|CLUSTER|ALL]",
)
@click.option(
"--use-latest-known-tag",
is_flag=True,
default=False,
help="Should the changes be committed and pull requests created?"
" If so, a commit and a PR with"
' "installation: shared packages version bump" message will'
" be created for all affected CLUSTER components.",
)
@click.option(
"--create-new-version-bump-commit",
is_flag=True,
default=False,
help="Should the changes be committed and pull requests created?"
" If so, a commit and a PR with"
' "installation: shared packages version bump" message will'
" be created for all affected CLUSTER components.",
)
@click.pass_context
def git_upgrade_common_modules(
ctx, component, use_latest_known_tag, create_new_version_bump_commit
): # noqa: D301
"""Upgrade selected components to latest REANA-Commons/DB version.
\b
:param components: The option ``component`` can be repeated. The value may
consist of:
* (1) standard component name such as
'reana-workflow-controller';
* (2) short component name such as 'r-w-controller';
* (3) special value '.' indicating component of the
current working directory;
* (4) special value 'CLUSTER' that will expand to
cover all REANA cluster components [default];
* (5) special value 'CLIENT' that will expand to
cover all REANA client components;
* (6) special value 'DEMO' that will expand
to include several runable REANA demo examples;
* (7) special value 'ALL' that will expand to include
all REANA repositories.
:type component: str
"""

def _commit_and_publish_version_bumps(components):
"""Create commit and version bump PRs for all specified components."""
for component in components:
has_changes = run_command(
"git status --porcelain --untracked-files=no | "
"grep setup.py || echo",
component=component,
return_output=True,
)
if has_changes:
branch_name = datetime.datetime.now().strftime("version-bump-%Y%m%d")
create_branch = "git checkout -b {}".format(branch_name)
run_command(create_branch, component)
create_commit = (
"git add setup.py && "
"git commit "
'-m "installation: shared packages version bump"'
)
run_command(create_commit, component)
create_pr = "hub pull-request -p --no-edit && hub pr list -L 1"
run_command(create_pr, component)
else:
click.echo("{} has no changes, skipping.".format(component))

def _commit(components):
for component in components:
commit_cmd = "git commit --amend --no-edit"
if create_new_version_bump_commit:
commit_cmd = 'git commit -m "installation: bump common modules"'

run_command(
f"git add setup.py requirements.txt && {commit_cmd}", component,
)

def _push_to_origin(components):
for component in components:
branch = run_command(
"git branch --show-current", component, return_output=True
)
run_command(
f"git push --force origin {branch}", component,
)

components = select_components(component)

for module in REPO_LIST_SHARED:
last_version = fetch_latest_pypi_version(module)
update_module_in_cluster_components(
module,
last_version,
components_to_update=components,
use_latest_known_tag=use_latest_known_tag,
)

_commit(components)
ctx.invoke(git_diff, component=component)
if click.confirm("Do you want to push your feature branches?"):
_push_to_origin(components)


git_commands_list = list(git_commands.commands.values())
69 changes: 69 additions & 0 deletions reana/reana_dev/utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
import click

from reana.config import (
COMPONENTS_USING_SHARED_MODULE_COMMONS,
COMPONENTS_USING_SHARED_MODULE_DB,
REPO_LIST_ALL,
REPO_LIST_CLIENT,
REPO_LIST_CLUSTER,
Expand Down Expand Up @@ -335,3 +337,70 @@ def get_prefixed_component_name(component):
:return: Prefixed name.
"""
return "-".join([INSTANCE_NAME, component])


def fetch_latest_pypi_version(package):
"""Fetch latest released version of a package."""
import requests

pypi_rc_info = requests.get("https://pypi.python.org/pypi/{}/json".format(package))
return sorted(pypi_rc_info.json()["releases"].keys())[-1]


def update_module_in_cluster_components(
module, new_version, components_to_update=None, use_latest_known_tag=True
):
"""Update the specified module version in all affected components."""
updatable_components = {
"reana-commons": COMPONENTS_USING_SHARED_MODULE_COMMONS + ["reana-client"],
"reana-db": COMPONENTS_USING_SHARED_MODULE_DB,
}[module]

if components_to_update:
components_to_update = set(components_to_update).intersection(
set(updatable_components)
)
else:
components_to_update = updatable_components

if components_to_update and not use_latest_known_tag:
tag = run_command("git tag --points-at", module, return_output=True)
if not tag:
click.secho(
f"[ERROR] Last commit of {module} does not point to a tag.",
err=True,
fg="red",
),
sys.exit(1)

for component in components_to_update:
branch = get_current_branch(get_srcdir(component))
if branch == "master":
click.secho(
f"[ERROR] Component {component} current branch is master.",
err=True,
fg="red",
),
sys.exit(1)
update_setup_py_dep_cmd = (
'LN=`cat setup.py | grep -n -e "{module}.*>=" | cut -f1 -d: `'
' && sed -i.bk "`echo $LN`s/>=.*,</>={new_version},</"'
" setup.py && rm setup.py.bk".format(module=module, new_version=new_version)
)
run_command(update_setup_py_dep_cmd, component)
update_requirements_txt_dep_cmd = (
'LN=`cat requirements.txt | grep -n -e "{module}.*==" | cut -f1 -d: `'
' && sed -i.bk "`echo $LN`s/==.*#/=={new_version}\t#/"'
" requirements.txt && rm requirements.txt.bk".format(
module=module, new_version=new_version
)
)
run_command(update_requirements_txt_dep_cmd, component)
if components_to_update:
click.secho(
"✅ {module} updated to: {last_version}".format(
module=module, last_version=new_version
),
bold=True,
fg="green",
)

0 comments on commit 347b980

Please sign in to comment.