Skip to content

Commit bb154fc

Browse files
authored
Merge pull request #261 from hbcarlos/no_tags
2 parents a8f0735 + 789f1f1 commit bb154fc

File tree

3 files changed

+51
-0
lines changed

3 files changed

+51
-0
lines changed

jupyter_releaser/changelog.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ def get_version_entry(
8383
branch = branch or util.get_branch()
8484
since = since or util.get_latest_tag(ref or branch, since_last_stable)
8585

86+
if since == "":
87+
since = util.get_first_commit(ref or branch)
88+
8689
util.log(f"Getting changes to {repo} since {since} on branch {branch}...")
8790

8891
if until:

jupyter_releaser/tests/test_functions.py

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,47 @@ def test_get_changelog_version_entry(py_package, mocker):
9898
assert testutil.PR_ENTRY in resp
9999

100100

101+
def test_get_changelog_version_entry_no_tag(py_package, mocker):
102+
version = util.get_version()
103+
104+
mocked_gen = mocker.patch("jupyter_releaser.changelog.generate_activity_md")
105+
mocked_gen.return_value = testutil.CHANGELOG_ENTRY
106+
branch = "foo"
107+
util.run("git branch baz/bar")
108+
commit = run("git rev-list --max-parents=0 HEAD", quiet=True)
109+
ref = "heads/baz/bar"
110+
resp = changelog.get_version_entry(ref, branch, "baz/bar", version)
111+
mocked_gen.assert_called_with(
112+
"baz/bar",
113+
since=commit,
114+
until=None,
115+
kind="pr",
116+
branch=branch,
117+
heading_level=2,
118+
auth=None,
119+
)
120+
121+
assert f"## {version}" in resp
122+
assert testutil.PR_ENTRY in resp
123+
124+
mocked_gen.return_value = testutil.CHANGELOG_ENTRY
125+
resp = changelog.get_version_entry(
126+
ref, branch, "baz/bar", version, resolve_backports=True, auth="bizz"
127+
)
128+
mocked_gen.assert_called_with(
129+
"baz/bar",
130+
since=commit,
131+
until=None,
132+
kind="pr",
133+
branch=branch,
134+
heading_level=2,
135+
auth="bizz",
136+
)
137+
138+
assert f"## {version}" in resp
139+
assert testutil.PR_ENTRY in resp
140+
141+
101142
def test_get_changelog_version_entry_since_last_stable(py_package, mocker):
102143
version = util.get_version()
103144

jupyter_releaser/util.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,13 @@ def get_latest_tag(source, since_last_stable=False):
281281
return tags[0]
282282

283283

284+
def get_first_commit(source):
285+
"""Get the default 'since' value for a branch"""
286+
source = source or get_branch()
287+
commit = run("git rev-list --max-parents=0 HEAD", quiet=True)
288+
return commit
289+
290+
284291
def retry(cmd, **kwargs):
285292
"""Run a command with retries"""
286293
attempt = 0

0 commit comments

Comments
 (0)