From 8b7a024454bb7cb88ea591103958ef698bfbab65 Mon Sep 17 00:00:00 2001 From: Marcel Bargull Date: Thu, 14 Mar 2024 13:28:15 +0100 Subject: [PATCH] Handle conda-build dev version numbers Signed-off-by: Marcel Bargull --- boa/core/utils.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/boa/core/utils.py b/boa/core/utils.py index 927590b7..2853e48a 100644 --- a/boa/core/utils.py +++ b/boa/core/utils.py @@ -20,6 +20,7 @@ from conda.core.index import check_allowlist from conda.models.channel import Channel as CondaChannel from conda.models.records import PackageRecord +from conda.models.version import VersionOrder from conda.common.url import join_url from boa.core.config import boa_config @@ -33,9 +34,15 @@ console = boa_config.console -if "+" in cb_version: - cb_version = cb_version[: cb_version.index("+")] -cb_split_version = tuple(int(x) for x in cb_version.split(".")) +_cb_base_version = [] +# VersionOrder cuts off "+..." local dev version suffix. +for _cb_version_part in VersionOrder(cb_version): + if len(_cb_version_part) > 1: + # Cut off at dev/pre/port parts (e.g. ".dev1" => ['0', 'DEV', '1']). + break + _cb_base_version.append(_cb_version_part) +cb_split_version = tuple(int(x) for x in _cb_base_version) +del _cb_base_version, _cb_version_part if "bsd" in sys.platform: