Skip to content

Commit

Permalink
fix: Download last full release during X.devY versions (#202)
Browse files Browse the repository at this point in the history
  • Loading branch information
ewuerger authored Jan 29, 2025
2 parents 53af623 + fbe1442 commit 25395d5
Showing 1 changed file with 15 additions and 10 deletions.
25 changes: 15 additions & 10 deletions src/capellambse_context_diagrams/_elkjs.py
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,19 @@ class ELKManager:
def __init__(self):
self._proc = None

@property
def runtime_version(self) -> str:
"""The version of the elkjs runtime package to download."""
package_version = importlib.metadata.version(
"capellambse_context_diagrams"
)
if ".dev" in package_version:
package_version, _ = package_version.split(".dev", 1)
head, tail = package_version.rsplit(".", 1)
assert tail != "0"
package_version = f"{head}.{int(tail) - 1}"
return package_version

@property
def binary_name(self):
system = platform.system().lower()
Expand All @@ -317,15 +330,10 @@ def binary_name(self):
}

build = build_mapping.get((system, machine))

package_version = importlib.metadata.version(
"capellambse_context_diagrams"
)

if not build:
raise RuntimeError(f"Unsupported platform: {system} {machine}")

return f"elk-v{package_version}-{build}{'.exe' if system == 'windows' else ''}"
return f"elk-v{self.runtime_version}-{build}{'.exe' if system == 'windows' else ''}"

@property
def binary_path(self):
Expand All @@ -341,10 +349,7 @@ def download_binary(self, force=False):

log.debug("Downloading elk.js helper binary")
self.binary_path.parent.mkdir(parents=True, exist_ok=True)
package_version = importlib.metadata.version(
"capellambse_context_diagrams"
)
url = f"https://github.com/DSD-DBS/capellambse-context-diagrams/releases/download/v{package_version}/{self.binary_name}"
url = f"https://github.com/DSD-DBS/capellambse-context-diagrams/releases/download/v{self.runtime_version}/{self.binary_name}"
response = requests.get(url)
response.raise_for_status()
with open(self.binary_path, "wb") as f:
Expand Down

0 comments on commit 25395d5

Please sign in to comment.