cloudconsolelink 4.2.0__tar.gz → 4.3.0__tar.gz

{cloudconsolelink-4.2.0/cloudconsolelink.egg-info → cloudconsolelink-4.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudconsolelink
-Version: 4.2.0
+Version: 4.3.0
 Summary: Generate console links for cloud resources
 Home-page: https://github.com/Cloudanix/cloud-console-links
 Maintainer: Cloudanix

{cloudconsolelink-4.2.0 → cloudconsolelink-4.3.0/cloudconsolelink.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudconsolelink
-Version: 4.2.0
+Version: 4.3.0
 Summary: Generate console links for cloud resources
 Home-page: https://github.com/Cloudanix/cloud-console-links
 Maintainer: Cloudanix

{cloudconsolelink-4.2.0 → cloudconsolelink-4.3.0}/setup.py

@@ -25,9 +25,18 @@ def read_requirements(path: str) -> list[str]:
     return lines
 
 
+def sdist_version() -> str:
+    # An unpacked sdist carries the version it was built with in PKG-INFO. pip/uv rebuild the sdist
+    # there with no git (and git could even read an enclosing repo's tags), so this wins.
+    for line in read_text("PKG-INFO", required=False).splitlines():
+        if line.startswith("Version:"):
+            return line.removeprefix("Version:").strip()
+    return ""
+
+
 def git_version(fallback: str) -> str:
     # ponytail: build-time version from the current git tag; falls back to
-    # __init__.py when git/tags are absent (e.g. building from an sdist tarball).
+    # __init__.py when git/tags are absent.
     try:
         tag = subprocess.check_output(
             ["git", "describe", "--tags", "--abbrev=0"],
@@ -41,7 +50,7 @@ def git_version(fallback: str) -> str:
 
 package_info: dict[str, object] = {}
 exec(read_text("cloudconsolelink/__init__.py"), package_info)
-version = git_version(str(package_info["__version__"]))
+version = sdist_version() or git_version(str(package_info["__version__"]))
 long_description = read_text("README.md")
 install_requires = read_requirements("requirements.txt")
 dev_requirements = read_requirements("requirements-dev.txt")

{cloudconsolelink-4.2.0 → cloudconsolelink-4.3.0}/tests/test_packaging.py

@@ -25,6 +25,35 @@ def test_sdist_includes_requirement_files(tmp_path):
     assert f"{archive_root}/requirements-dev.txt" in archive_names
 
 
+def test_sdist_rebuilds_with_its_own_version(tmp_path):
+    # pip/uv install an sdist by rebuilding it from the unpacked tarball, where there is no git.
+    # Before: setup.py fell back to __init__.__version__ there (4.0.1), so installing 4.1.2 failed
+    # with "Package metadata version 4.0.1 does not match given version 4.1.2".
+    dist_dir = tmp_path / "dist"
+    subprocess.run(
+        [sys.executable, "setup.py", "sdist", "--dist-dir", str(dist_dir)],
+        cwd=REPO_ROOT,
+        check=True,
+        capture_output=True,
+        text=True,
+    )
+    archive_path = next(dist_dir.glob("cloudconsolelink-*.tar.gz"))
+    built_version = archive_path.name.removesuffix(".tar.gz").removeprefix("cloudconsolelink-")
+    unpack_dir = tmp_path / "unpacked"
+    with tarfile.open(archive_path, "r:gz") as archive:
+        archive.extractall(unpack_dir, filter="data")
+
+    rebuilt = subprocess.run(
+        [sys.executable, "setup.py", "--version"],
+        cwd=unpack_dir / archive_path.name.removesuffix(".tar.gz"),
+        check=True,
+        capture_output=True,
+        text=True,
+    )
+
+    assert rebuilt.stdout.strip().splitlines()[-1] == built_version
+
+
 def test_egg_info_excludes_local_bootstrap_requirement(tmp_path):
     subprocess.run(
         [sys.executable, "setup.py", "egg_info"],