Merge pull request #228 from lilyinstarlight/feature/version-prefixed…

…-unstable-versions

prefix unstable version numbers with latest release per current guidelines

nix_update/version/bitbucket.py

@@ -26,5 +26,9 @@ def fetch_bitbucket_snapshots(url: ParseResult, branch: str) -> list[Version]:
     commits_url = f'https://{url.netloc}/!api/2.0/repositories/{owner}/{repo}/refs?q=name="{branch}"'
     resp = urlopen(commits_url)
     ref = json.loads(resp.read())["values"][0]["target"]
+
+    versions = fetch_bitbucket_versions(url)
+    latest_version = versions[0].number if versions else "0"
+
     date = ref["date"][:10]  # to YYYY-MM-DD
-    return [Version(f"unstable-{date}", rev=ref["hash"])]
+    return [Version(f"{latest_version}-unstable-{date}", rev=ref["hash"])]

nix_update/version/gitea.py

@@ -29,5 +29,8 @@ def fetch_gitea_snapshots(url: ParseResult, branch: str) -> list[Version]:
     if commit is None:
         return []
 
+    versions = fetch_gitea_versions(url)
+    latest_version = versions[0].number if versions else "0"
+
     date = commit["commit"]["committer"]["date"][:10]
-    return [Version(f"unstable-{date}", rev=commit["sha"])]
+    return [Version(f"{latest_version}-unstable-{date}", rev=commit["sha"])]

nix_update/version/github.py

@@ -47,6 +47,9 @@ def fetch_github_snapshots(url: ParseResult, branch: str) -> list[Version]:
     tree = ET.fromstring(resp.read())
     commits = tree.findall(".//{http://www.w3.org/2005/Atom}entry")
 
+    versions = fetch_github_versions(url)
+    latest_version = versions[0].number if versions else "0"
+
     for entry in commits:
         link = entry.find("{http://www.w3.org/2005/Atom}link")
         updated = entry.find("{http://www.w3.org/2005/Atom}updated")
@@ -56,6 +59,6 @@ def fetch_github_snapshots(url: ParseResult, branch: str) -> list[Version]:
         url = urlparse(link.attrib["href"])
         commit = url.path.rsplit("/", maxsplit=1)[-1]
         date = updated.text.split("T", maxsplit=1)[0]
-        return [Version(f"unstable-{date}", rev=commit)]
+        return [Version(f"{latest_version}-unstable-{date}", rev=commit)]
 
     return []

nix_update/version/gitlab.py

@@ -51,8 +51,15 @@ def fetch_gitlab_snapshots(url: ParseResult, branch: str) -> list[Version]:
     info(f"fetch {gitlab_url}")
     resp = urllib.request.urlopen(gitlab_url)
     commits = json.load(resp)
+
+    versions = fetch_gitlab_versions(url)
+    latest_version = versions[0].number if versions else "0"
+
     for commit in commits:
-        date = datetime.strptime(commit["committed_date"], "%Y-%m-%dT%H:%M:%S.000%z")
-        date -= date.utcoffset()  # type: ignore[operator]
-        return [Version(date.strftime("unstable-%Y-%m-%d"), rev=commit["id"])]
+        commit_date = datetime.strptime(
+            commit["committed_date"], "%Y-%m-%dT%H:%M:%S.000%z"
+        )
+        commit_date -= commit_date.utcoffset()  # type: ignore[operator]
+        date = commit_date.strftime("%Y-%m-%d")
+        return [Version(f"{latest_version}-unstable-{date}", rev=commit["id"])]
     return []

tests/test_branch.py

@@ -13,8 +13,10 @@
 
 
 def fake_urlopen(url: str) -> BinaryIO:
-    del url
-    return open(TEST_ROOT.joinpath("test_branch.atom"), "rb")
+    if url.endswith("releases.atom"):
+        return open(TEST_ROOT.joinpath("test_branch_releases.atom"), "rb")
+    else:
+        return open(TEST_ROOT.joinpath("test_branch_commits_master.atom"), "rb")
 
 
 def test_branch(helpers: conftest.Helpers) -> None:
@@ -27,5 +29,5 @@ def test_branch(helpers: conftest.Helpers) -> None:
                 "(.*)",
                 "master",
             ).number
-            == "unstable-2021-12-13"
+            == "1.2.0-unstable-2024-02-19"
         )