Skip to content

Commit 0de547c

Browse files
committed
Code review
1 parent e1cf181 commit 0de547c

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

{{cookiecutter.project_slug}}/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ re-creating the database from scratch on each run.
8484

8585
Before deploying, you should update the CHANGELOG.md file with the latest changes by running:
8686
```
87-
docker-compose exec backend fab <environment> generate_changelog
87+
docker-compose exec backend fab <environment> generate-changelog
8888
```
8989

9090
**Note**: this step is not strictly required, but be aware that the CHANGELOG.md file should reflect the current status

{{cookiecutter.project_slug}}/fabfile.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,6 @@ def outgoing_commits(c):
360360
print_commits(get_outgoing_commits(c))
361361

362362

363-
@task
364363
@remote
365364
def files_to_deploy(c):
366365
with c.conn.cd(c.conn.project_root):
@@ -396,7 +395,7 @@ def get_local_modifications_count():
396395

397396
@task
398397
@remote
399-
def generate_changelog(c, ignorecheck="n", initialize="n", **kwargs):
398+
def generate_changelog(c, ignorecheck=False, initialize=False, **kwargs):
400399
local_modification_count = get_local_modifications_count()
401400
check_ignored = ignorecheck.lower() in ("y", "yes")
402401
initialize = initialize.lower() in ("y", "yes")
@@ -411,7 +410,6 @@ def generate_changelog(c, ignorecheck="n", initialize="n", **kwargs):
411410
"generate_changelog",
412411
**{
413412
"jira-prefix": jira_prefix,
414-
"environment": c.config.environment,
415413
"git-path": local_project_root,
416414
"initialize": initialize
417415
},
@@ -546,11 +544,6 @@ def import_db(c, dump_file=None, with_media=False):
546544
def jira_release(c, command, **kwargs):
547545
full_kwargs = dict()
548546

549-
if c.config["environment"] == "prod":
550-
command = "comment_and_close_issues_to_deploy"
551-
else:
552-
command = "comment_after_deploy"
553-
554547
if "remote-version" not in kwargs and "to-deploy-version" not in kwargs:
555548
with c.conn.cd(c.conn.project_root):
556549
remote_version = c.conn.git("rev-parse last_master", hide=True).stdout.strip()
@@ -632,7 +625,7 @@ def deploy(c, noconfirm=False):
632625
).lower() not in ("y", "yes"):
633626
return
634627

635-
if "CHANGELOG.md" not in files_to_deploy():
628+
if "CHANGELOG.md" not in files_to_deploy(c):
636629
if input(
637630
"Warning ! It seems that the CHANGELOG file was not updated for this deployment. "
638631
"Do you want to proceed ? [y/N] "

0 commit comments

Comments
 (0)