fixed releasing from a branch

gdementen · gdementen · commit f231827f14a0 · 2020-04-01T11:24:28.000+02:00
diff --git a/doc/source/fetch_changelogs.py b/doc/source/fetch_changelogs.py
@@ -30,21 +30,21 @@ def fetch_changelog(section_name, release_name, github_rep, rel_changes_dir='/do
                ['git', 'commit', '-m', f'fetched {section_name} changelog for {short(release_name)}', str(fpath)])
 
 
-def fetch_changelogs(release_name):
-    fetch_changelog('editor', release_name, EDITOR_GITHUB_REP)
+def fetch_changelogs(release_name, branch='master'):
+    fetch_changelog('editor', release_name, EDITOR_GITHUB_REP, branch=branch)
 
-    print(echocall(['git', 'log', 'upstream/master..HEAD']))
+    print(echocall(['git', 'log', f'origin/{branch}..HEAD']))
     if yes('Are the above commits ready to be pushed?', default='n'):
         doechocall('Pushing changes to GitHub',
-                   ['git', 'push', 'upstream', 'master', '--follow-tags'])
+                   ['git', 'push', 'origin', branch, '--follow-tags'])
 
 
 if __name__ == '__main__':
     import sys
 
     argv = sys.argv
     if len(argv) < 2:
-        print(f"Usage: {argv[0]} release_name")
+        print(f"Usage: {argv[0]} release_name [branch]")
         sys.exit()
 
-    fetch_changelogs(argv[1])
+    fetch_changelogs(*argv[1:])
diff --git a/make_release.py b/make_release.py
@@ -46,13 +46,13 @@ def update_metapackage(public_release, repository, release_name, **extra_kwargs)
                 '--summary', "'Package installing larray and all sub-projects and optional dependencies'"])
 
 
-def merge_changelogs(build_dir, src_documentation, release_name, public_release, **extra_kwargs):
+def merge_changelogs(build_dir, src_documentation, release_name, public_release, branch='master', **extra_kwargs):
     chdir(join(build_dir, src_documentation))
 
     if not public_release:
         return
 
-    check_call(['python', 'fetch_changelogs.py', release_name])
+    check_call(['python', 'fetch_changelogs.py', release_name, branch])
 
 
 insert_step_func(merge_changelogs, msg='append changelogs from larray-editor project', before='update_changelog')
