From a0c71da0d252339fd9d27e84fea4723b913156d8 Mon Sep 17 00:00:00 2001 From: Leander Stephen D'Souza Date: Tue, 16 Sep 2025 13:11:35 +0100 Subject: [PATCH] Replaced vcstools with vcs2l. Signed-off-by: Leander Stephen D'Souza --- bloom/commands/export_upstream.py | 4 ++-- bloom/commands/git/release.py | 4 ++-- bloom/commands/release.py | 11 +++++------ bloom/util.py | 2 +- setup.py | 2 +- stdeb.cfg | 2 +- test/system_tests/test_catkin_release.py | 4 ++-- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/bloom/commands/export_upstream.py b/bloom/commands/export_upstream.py index c6448968..c571e135 100644 --- a/bloom/commands/export_upstream.py +++ b/bloom/commands/export_upstream.py @@ -59,10 +59,10 @@ from bloom.util import temporary_directory try: - from vcstools.vcs_abstraction import get_vcs_client + from vcs2l.clients import get_vcs_client except ImportError: debug(traceback.format_exc()) - error("vcstools was not detected, please install it.", file=sys.stderr, + error("vcs2l was not detected, please install it.", file=sys.stderr, exit=True) diff --git a/bloom/commands/git/release.py b/bloom/commands/git/release.py index cad745c8..422547be 100644 --- a/bloom/commands/git/release.py +++ b/bloom/commands/git/release.py @@ -74,10 +74,10 @@ from bloom.util import safe_input try: - from vcstools.vcs_abstraction import get_vcs_client + from vcs2l.clients import get_vcs_client except ImportError: debug(traceback.format_exc()) - error("vcstools was not detected, please install it.", file=sys.stderr, + error("vcs2l was not detected, please install it.", file=sys.stderr, exit=True) upstream_repos = {} diff --git a/bloom/commands/release.py b/bloom/commands/release.py index 35837e00..434922b4 100644 --- a/bloom/commands/release.py +++ b/bloom/commands/release.py @@ -110,13 +110,12 @@ from bloom.util import to_unicode try: - import vcstools + import vcs2l except ImportError: debug(traceback.format_exc()) - error("vcstools was not detected, please install it.", file=sys.stderr, + error("vcs2l was not detected, please install it.", file=sys.stderr, exit=True) -import vcstools.__version__ -from vcstools.vcs_abstraction import get_vcs_client +from vcs2l.clients import get_vcs_client from rosdistro import DistributionFile from rosdistro import get_distribution_files @@ -854,7 +853,7 @@ def update_summary(track, repository, distro): - catkin_pkg version: `{catkin_pkg_v}` - rosdep version: `{rosdep_v}` - rosdistro version: `{rosdistro_v}` -- vcstools version: `{vcstools_v}` +- vcs2l version: `{vcs2l_v}` """.format( repo=repository, upstream_repo_url=track_dict['vcs_uri'], @@ -867,7 +866,7 @@ def update_summary(track, repository, distro): # Until https://github.com/ros-infrastructure/rosdistro/issues/16 rosdistro_v=pkg_resources.require("rosdistro")[0].version, rosdep_v=rosdep2.__version__, - vcstools_v=vcstools.__version__.version + vcs2l_v=vcs2l.__version__, ) summary_file.write(msg) diff --git a/bloom/util.py b/bloom/util.py index 7ef46093..c6af725e 100755 --- a/bloom/util.py +++ b/bloom/util.py @@ -117,7 +117,7 @@ class code(object): INVALID_VERSION = 30 INVALID_UPSTREAM_TAG = 31 INVALID_BRANCH_ARGS = 40 - VCSTOOLS_NOT_FOUND = 50 + VCS2L_NOT_FOUND = 50 ROSDEP_NOT_FOUND = 51 EMPY_NOT_FOUND = 52 ROSDEP_FAILED = 53 diff --git a/setup.py b/setup.py index 476911b0..a569a45a 100755 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ 'PyYAML', 'rosdep >= 0.15.0', 'rosdistro >= 0.8.0', - 'vcstools >= 0.1.22', + 'vcs2l @ git+https://github.com/ros-infrastructure/vcs2l.git@leander-dsouza/vcstools-port', ], extras_require={ 'test': [ diff --git a/stdeb.cfg b/stdeb.cfg index d986283f..017b9026 100755 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -1,7 +1,7 @@ [DEFAULT] ; release with a high debinc to avoid conflict with upstream debian of the same release version Debian-Version: 100 -Depends3: python3-yaml, python3-empy, python3-packaging, python3-rosdep (>= 0.15.0), python3-rosdistro (>= 0.8.0), python3-vcstools (>= 0.1.22), python3-setuptools, python3-catkin-pkg (>= 0.4.3) +Depends3: python3-yaml, python3-empy, python3-packaging, python3-rosdep (>= 0.15.0), python3-rosdistro (>= 0.8.0), python3-vcs2l, python3-setuptools, python3-catkin-pkg (>= 0.4.3) Conflicts3: python-bloom Copyright-File: LICENSE.txt Suite3: focal jammy noble bookworm trixie diff --git a/test/system_tests/test_catkin_release.py b/test/system_tests/test_catkin_release.py index ca5e6b8c..f697cae8 100644 --- a/test/system_tests/test_catkin_release.py +++ b/test/system_tests/test_catkin_release.py @@ -9,9 +9,9 @@ import sys try: - from vcstools.vcs_abstraction import get_vcs_client + from vcs2l.clients import get_vcs_client except ImportError: - print("vcstools was not detected, please install it.", file=sys.stderr) + print("vcs2l was not detected, please install it.", file=sys.stderr) sys.exit(1) from .common import create_release_repo