Merge pull request #118 from fcollonval/fix/restore-since

Restore capture of since parameter

jupyter_releaser/actions/draft_changelog.py

@@ -1,8 +1,25 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
+import os
+
+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
 
 run("jupyter-releaser prep-git")
+
+# Capture the "since" argument in case we add tags befor checking changelog
+# Do this before bumping the version
+if not os.environ.get("RH_SINCE"):
+    curr_dir = os.getcwd()
+    os.chdir(CHECKOUT_NAME)
+    since = get_latest_tag(os.environ["RH_BRANCH"]) or ""
+    if since:
+        log(f"Capturing {since} in RH_SINCE variable")
+        os.environ["RH_SINCE"] = since
+    os.chdir(curr_dir)
+
 run("jupyter-releaser bump-version")
 run("jupyter-releaser build-changelog")
 run("jupyter-releaser draft-changelog")

jupyter_releaser/actions/draft_release.py

@@ -7,6 +7,7 @@
 
 from jupyter_releaser.changelog import extract_current
 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
 
@@ -31,6 +32,18 @@
         run("pip install -q -e .")
 
 run("jupyter-releaser prep-git")
+
+# Capture the "since" argument in case we add tags befor checking changelog
+# Do this before bumping the version
+if not os.environ.get("RH_SINCE"):
+    curr_dir = os.getcwd()
+    os.chdir(CHECKOUT_NAME)
+    since = get_latest_tag(os.environ["RH_BRANCH"]) or ""
+    if since:
+        log(f"Capturing {since} in RH_SINCE variable")
+        os.environ["RH_SINCE"] = since
+    os.chdir(curr_dir)
+
 run("jupyter-releaser bump-version")
 
 if check_release: