diff --git a/bench/commands/__init__.py b/bench/commands/__init__.py index b7ac45a3..174c082e 100755 --- a/bench/commands/__init__.py +++ b/bench/commands/__init__.py @@ -47,7 +47,7 @@ bench_command.add_command(switch_to_develop) from bench.commands.utils import (start, restart, set_nginx_port, set_ssl_certificate, set_ssl_certificate_key, set_url_root, set_mariadb_host, set_default_site, download_translations, shell, backup_site, backup_all_sites, release, renew_lets_encrypt, - disable_production, bench_src, prepare_staging) + disable_production, bench_src) bench_command.add_command(start) bench_command.add_command(restart) bench_command.add_command(set_nginx_port) @@ -61,7 +61,6 @@ bench_command.add_command(shell) bench_command.add_command(backup_site) bench_command.add_command(backup_all_sites) bench_command.add_command(release) -bench_command.add_command(prepare_staging) bench_command.add_command(renew_lets_encrypt) bench_command.add_command(disable_production) bench_command.add_command(bench_src) diff --git a/bench/commands/utils.py b/bench/commands/utils.py index 3a3202c4..408d542a 100644 --- a/bench/commands/utils.py +++ b/bench/commands/utils.py @@ -130,14 +130,6 @@ def release(app, bump_type, from_branch, to_branch, owner, repo_name, remote): release(bench_path='.', app=app, bump_type=bump_type, from_branch=from_branch, to_branch=to_branch, remote=remote, owner=owner, repo_name=repo_name) -@click.command('prepare-staging') -@click.argument('app') -def prepare_staging(app): - """Prepare staging branch from develop branch""" - from bench.prepare_staging import prepare_staging - prepare_staging(bench_path='.', app=app) - - @click.command('disable-production') def disable_production(): """Disables production environment for the bench.""" diff --git a/bench/release.py b/bench/release.py index ab35a9fd..6025d4a7 100755 --- a/bench/release.py +++ b/bench/release.py @@ -31,9 +31,6 @@ def release(bench_path, app, bump_type, from_branch='develop', to_branch='master print('bench not configured to release') sys.exit(1) - if config.get('branches_to_update'): - branches_to_update.update(config.get('branches_to_update')) - validate(bench_path, config) bump(bench_path, app, bump_type, from_branch=from_branch, to_branch=to_branch, owner=owner,