Merge pull request #163 from jtpio/fix-since

Fix Handling of Since Last Stable

Author: Steven Silvester

jupyter_releaser/actions/draft_changelog.py

@@ -14,7 +14,8 @@
 if not os.environ.get("RH_SINCE"):
     curr_dir = os.getcwd()
     os.chdir(CHECKOUT_NAME)
-    since = get_latest_tag(os.environ["RH_BRANCH"]) or ""
+    since_last_stable = os.environ.get("RH_SINCE_LAST_STABLE")
+    since = get_latest_tag(os.environ["RH_BRANCH"], since_last_stable)
     if since:
         log(f"Capturing {since} in RH_SINCE variable")
         os.environ["RH_SINCE"] = since

jupyter_releaser/actions/draft_release.py

@@ -38,7 +38,8 @@
 if not os.environ.get("RH_SINCE"):
     curr_dir = os.getcwd()
     os.chdir(CHECKOUT_NAME)
-    since = get_latest_tag(os.environ["RH_BRANCH"]) or ""
+    since_last_stable = os.environ.get("RH_SINCE_LAST_STABLE")
+    since = get_latest_tag(os.environ["RH_BRANCH"], since_last_stable)
     if since:
         log(f"Capturing {since} in RH_SINCE variable")
         os.environ["RH_SINCE"] = since

jupyter_releaser/changelog.py

@@ -80,7 +80,7 @@ def get_version_entry(
     str
         A formatted changelog entry with markers
     """
-    since = since or _get_since(ref or branch, since_last_stable)
+    since = since or util.get_latest_tag(ref or branch, since_last_stable)
 
     util.log(f"Getting changes to {repo} since {since} on branch {branch}...")
 
@@ -290,23 +290,3 @@ def extract_current(changelog_path):
         if start != -1 and end != -1:
             body = changelog[start + len(START_MARKER) : end]
     return body
-
-
-def _get_since(source, since_last_stable=False):
-    """Get the appropriate since reference or None"""
-    tags = util.run(
-        f"git --no-pager tag --sort=-creatordate --merged {source}", quiet=True
-    )
-    if not tags:
-        return
-
-    tags = tags.splitlines()
-
-    if since_last_stable:
-        stable_tag = re.compile(r"\d\.\d\.\d$")
-        tags = [t for t in tags if re.search(stable_tag, t)]
-        if not tags:
-            return
-        return tags[0]
-
-    return tags[0]

jupyter_releaser/util.py

@@ -254,11 +254,22 @@ def actions_output(name, value):
         print(f"::set-output name={name}::{value}")
 
 
-def get_latest_tag(branch):
+def get_latest_tag(source, since_last_stable=False):
     """Get the default 'since' value for a branch"""
-    tags = run(f"git --no-pager tag --sort=-creatordate --merged {branch}", quiet=True)
-    if tags:
-        return tags.splitlines()[0]
+    tags = run(f"git --no-pager tag --sort=-creatordate --merged {source}", quiet=True)
+    if not tags:
+        return ""
+
+    tags = tags.splitlines()
+
+    if since_last_stable:
+        stable_tag = re.compile(r"\d\.\d\.\d$")
+        tags = [t for t in tags if re.search(stable_tag, t)]
+        if not tags:
+            return ""
+        return tags[0]
+
+    return tags[0]
 
 
 def retry(cmd, **kwargs):