Merge pull request #91 from blink1073/preserve-tag

More Cleanup

Author: Steven Silvester

jupyter_releaser/actions/draft_release.py

@@ -6,6 +6,7 @@
 from subprocess import CalledProcessError
 
 from jupyter_releaser.util import CHECKOUT_NAME
+from jupyter_releaser.util import get_latest_tag
 from jupyter_releaser.util import log
 from jupyter_releaser.util import run
 
@@ -38,6 +39,14 @@
     Path(changelog_location).write_text(changelog_text)
 
 run("jupyter-releaser check-changelog")
+
+# Capture the "since" argument in case we add tags before the second
+# "Check Changelog"
+curr_dir = os.getcwd()
+os.chdir(CHECKOUT_NAME)
+os.environ.setdefault("RH_SINCE", get_latest_tag(os.environ["RH_BRANCH"]))
+os.chdir(curr_dir)
+
 # Make sure npm comes before python in case it produces
 # files for the python package
 run("jupyter-releaser build-npm")

jupyter_releaser/changelog.py

@@ -65,10 +65,7 @@ def get_version_entry(
     str
         A formatted changelog entry with markers
     """
-    if not since:
-        tags = util.run(f"git --no-pager tag --sort=-creatordate --merged {branch}")
-        if tags:
-            since = tags.splitlines()[0]
+    since = since or util.get_latest_tag(branch)
 
     branch = branch.split("/")[-1]
     util.log(f"Getting changes to {repo} since {since} on branch {branch}...")

jupyter_releaser/cli.py

@@ -86,6 +86,8 @@ def invoke(self, ctx):
             before_hooks = hooks[before]
             if isinstance(before_hooks, str):
                 before_hooks = [before_hooks]
+            if before_hooks:
+                util.log(f"\nRunning hooks for {before}")
             for hook in before_hooks:
                 util.run(hook)
 
@@ -104,6 +106,8 @@ def invoke(self, ctx):
             after_hooks = hooks[after]
             if isinstance(after_hooks, str):
                 after_hooks = [after_hooks]
+            if after_hooks:
+                util.log(f"\nRunning hooks for {after}")
             for hook in after_hooks:
                 util.run(hook)
 

jupyter_releaser/util.py

@@ -243,6 +243,13 @@ def actions_output(name, value):
         print(f"::set-output name={name}::{value}")
 
 
+def get_latest_tag(branch):
+    """Get the default 'since' value for a branch"""
+    tags = run(f"git --no-pager tag --sort=-creatordate --merged {branch}")
+    if tags:
+        return tags.splitlines()[0]
+
+
 def read_config():
     """Read the jupyter-releaser config data"""
     if JUPYTER_RELEASER_CONFIG.exists():