Replaced vcstools with vcs2l.

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)
 
 

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 = {}

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)
 

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

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': [

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

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