From db0da74c07192fe58c2239a9275db6c8bea01d02 Mon Sep 17 00:00:00 2001 From: "Marco A. Gutierrez" Date: Mon, 22 Jan 2024 05:21:30 +0000 Subject: [PATCH 1/2] Update legacy version. Signed-off-by: Marco A. Gutierrez --- ros_buildfarm/__init__.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ros_buildfarm/__init__.py b/ros_buildfarm/__init__.py index c9e83afcc..81dc06ef2 100644 --- a/ros_buildfarm/__init__.py +++ b/ros_buildfarm/__init__.py @@ -17,4 +17,4 @@ # same version as in: # - setup.py # - stdeb.cfg -__version__ = '3.0.1-master' +__version__ = '3.0.1+master' diff --git a/setup.py b/setup.py index cb7ad7c79..3cdb734a5 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ # same version as in: # - ros_buildfarm/__init__.py # - stdeb.cfg - 'version': '3.0.1-master', + 'version': '3.0.1+master', 'python_requires': '>=3.6', 'packages': find_packages(exclude=['test']), 'package_data': { From 044931d77c1a70760ce5e509ad5a93bbe48d5641 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Thu, 4 Apr 2024 16:23:43 -0500 Subject: [PATCH 2/2] Handle version splitting with 'local' version delimiter --- ros_buildfarm/git.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ros_buildfarm/git.py b/ros_buildfarm/git.py index fa2c9a0aa..425f4876c 100644 --- a/ros_buildfarm/git.py +++ b/ros_buildfarm/git.py @@ -175,6 +175,8 @@ def get_hash(path): def _get_version_parts(): version_parts = __version__.split('-', 1) + if len(version_parts) < 2: + version_parts = __version__.split('+', 1) if len(version_parts) == 2: return version_parts return version_parts[0], None