Merge pull request #120 from fcollonval/fix/since

Fix usage of since parameter

Author: Steven Silvester

.github/workflows/test.yml

@@ -125,15 +125,15 @@ jobs:
           GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           RH_REPOSITORY: jupyter-server/jupyter_releaser
           RH_BRANCH: master
-          RU_SINCE: v0.3.0
+          RH_SINCE: v0.3.0
           INPUT_UNTIL: v0.4.0
         run: |
           set -eux
           python -m jupyter_releaser.actions.generate-changelog
           cat CHANGELOG_ENTRY.md
           # Check for version entry in between the two versions and one outside
           cat CHANGELOG_ENTRY.md | grep -q "#95"
-          cat CHANGELOG_ENTRY.md | grep -q "compare/0.3.3...v0.4.0"
+          cat CHANGELOG_ENTRY.md | grep -q "compare/v0.3.0...v0.4.0"
       - name: Coverage
         run: |
           codecov

jupyter_releaser/changelog.py

@@ -78,9 +78,10 @@ def get_version_entry(
         A formatted changelog entry with markers
     """
 
-    if since:
+    if not since:
+        source = ref or branch
         tags = util.run(
-            f"git --no-pager tag --sort=-creatordate --merged {ref}", quiet=True
+            f"git --no-pager tag --sort=-creatordate --merged {source}", quiet=True
         )
         if tags:
             since = tags.splitlines()[0]

jupyter_releaser/tests/test_functions.py

@@ -53,11 +53,13 @@ def test_get_changelog_version_entry(py_package, mocker):
     mocked_gen = mocker.patch("jupyter_releaser.changelog.generate_activity_md")
     mocked_gen.return_value = testutil.CHANGELOG_ENTRY
     branch = "foo"
-    ref = "origin/bar/baz"
-    resp = changelog.get_version_entry(ref, branch, "bar/baz", version)
+    util.run("git branch baz/bar")
+    util.run("git tag v1.0 baz/bar")
+    ref = "heads/baz/bar"
+    resp = changelog.get_version_entry(ref, branch, "baz/bar", version)
     mocked_gen.assert_called_with(
-        "bar/baz",
-        since=None,
+        "baz/bar",
+        since="v1.0",
         until=None,
         kind="pr",
         branch=branch,
@@ -70,11 +72,11 @@ def test_get_changelog_version_entry(py_package, mocker):
 
     mocked_gen.return_value = testutil.CHANGELOG_ENTRY
     resp = changelog.get_version_entry(
-        ref, branch, "bar/baz", version, resolve_backports=True, auth="bizz"
+        ref, branch, "baz/bar", version, resolve_backports=True, auth="bizz"
     )
     mocked_gen.assert_called_with(
-        "bar/baz",
-        since=None,
+        "baz/bar",
+        since="v1.0",
         until=None,
         kind="pr",
         branch=branch,