From 922e838a4979d27e6132cb5be01008d7bca4a787 Mon Sep 17 00:00:00 2001 From: "Marco A. Gutierrez" Date: Wed, 13 Nov 2024 06:47:02 +0800 Subject: [PATCH] Update version string as it's not compatible after setuptools 66+ (#1018) * Use local version separator instead of relying on legacy version support. Signed-off-by: Marco A. Gutierrez * Handle version splitting with 'local' version delimiter. --------- Signed-off-by: Marco A. Gutierrez Co-authored-by: Marco A. Gutierrez Co-authored-by: Scott K Logan --- ros_buildfarm/__init__.py | 2 +- ros_buildfarm/git.py | 2 ++ setup.py | 2 +- 3 files changed, 4 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/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 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': {