From 360075b869e90c7d2819caf9bfb67ec62db63a0d Mon Sep 17 00:00:00 2001 From: Richard Canik Date: Mon, 26 Jun 2023 16:45:37 +0200 Subject: [PATCH 1/2] Use the `pip_cmd` with `list --format freeze` argument --- src/rosdep2/installers.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/rosdep2/installers.py b/src/rosdep2/installers.py index 342df780e..e4dad6686 100644 --- a/src/rosdep2/installers.py +++ b/src/rosdep2/installers.py @@ -34,6 +34,7 @@ import traceback from rospkg.os_detect import OsDetect +from urllib.parse import urlparse from .core import rd_debug, RosdepInternalError, InstallFailed, print_bold, InvalidData @@ -599,10 +600,20 @@ def run_command(command, installer_key, failures, verbose): if not continue_on_error: raise InstallFailed(failures=failures) + def is_valid_url(url): + try: + out = urlparse(url) + return all([out.scheme, out.netloc]) + except ValueError: + return False + # test installation of each for r in resolved: - if not installer.is_installed(r): - failures.append((installer_key, 'Failed to detect successful installation of [%s]' % (r))) + if not is_valid_url(r): + if not installer.is_installed(r): + failures.append((installer_key, 'Failed to detect successful installation of [%s]' % (r))) + else: + print('WARNING: package "%s" could not be checked, the installation was executed via the URL' % r) # finalize result if failures: raise InstallFailed(failures=failures) From 05b39fc40743d8e2b67f2ddd15680783815b1b4c Mon Sep 17 00:00:00 2001 From: Richard Canik Date: Mon, 26 Jun 2023 12:46:04 +0200 Subject: [PATCH 2/2] 0.22.3 --- setup.py | 2 +- src/rosdep2/_version.py | 2 +- stdeb.cfg | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 3605adbf7..422fb64a8 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ # same version as in: # - src/rosdep2/__init__.py # - stdeb.cfg - 'version': '0.22.2', + 'version': '0.22.3', 'packages': ['rosdep2', 'rosdep2.ament_packages', 'rosdep2.platforms'], 'package_dir': {'': 'src'}, 'install_requires': ['PyYAML >= 3.1', 'setuptools'], diff --git a/src/rosdep2/_version.py b/src/rosdep2/_version.py index 32e7eb016..6a5f19fc9 100644 --- a/src/rosdep2/_version.py +++ b/src/rosdep2/_version.py @@ -1,4 +1,4 @@ # same version as in: # - setup.py # - stdeb.cfg -__version__ = '0.22.2' +__version__ = '0.22.3' diff --git a/stdeb.cfg b/stdeb.cfg index bc338d43b..1b309dc95 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -2,11 +2,11 @@ ; rosdep-modules same version as in: ; - setup.py ; - src/rosdep2/_version.py -Depends: python-rosdep-modules (>= 0.22.2) +Depends: python-rosdep-modules (>= 0.22.3) ; rosdep-modules same version as in: ; - setup.py ; - src/rosdep2/_version.py -Depends3: python3-rosdep-modules (>= 0.22.2) +Depends3: python3-rosdep-modules (>= 0.22.3) Conflicts: python3-rosdep, python-rosdep2, python3-rosdep2 Conflicts3: python-rosdep, python-rosdep2, python3-rosdep2 Copyright-File: LICENSE