From f7c361b27a578037cd2476cb2925949a029143a6 Mon Sep 17 00:00:00 2001 From: Shane Loretz Date: Fri, 21 Jan 2022 13:49:07 -0800 Subject: [PATCH 1/4] Setup find_installed_packages to fix bootstrap instructions Signed-off-by: Shane Loretz --- bin/colcon | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bin/colcon b/bin/colcon index 1d7cb0d2..b1d93434 100755 --- a/bin/colcon +++ b/bin/colcon @@ -65,6 +65,10 @@ from colcon_core.prefix_path.colcon import ColconPrefixPath # noqa: E402 from colcon_core.shell import ALL_SHELLS_ENVIRONMENT_VARIABLE # noqa: E402 from colcon_core.shell.bat import BatShell # noqa: E402 from colcon_core.shell.dsv import DsvShell # noqa: E402 +from colcon_core.shell.installed_packages \ + import IsolatedInstalledPackageFinder # noqa: E402 +from colcon_core.shell.installed_packages \ + import MergedInstalledPackageFinder # noqa: E402 from colcon_core.shell.sh import ShShell # noqa: E402 from colcon_core.task.python.build import PythonBuildTask # noqa: E402 from colcon_core.task.python.test import PythonTestTask # noqa: E402 @@ -101,6 +105,10 @@ custom_entry_points.update({ # there is no point in registering the extension_point extensions here # since they can't be queried through pkg_resources without installing }, + 'colcon_core.shell.find_installed_packages': { + 'colcon_isolated' : IsolatedInstalledPackageFinder, + 'colcon_merged' : MergedInstalledPackageFinder, + }, 'colcon_core.package_augmentation': { 'python': PythonPackageAugmentation, }, From 0b01b4e3d992a1f1a6c8fa823689a9affe47f78a Mon Sep 17 00:00:00 2001 From: Shane Loretz Date: Fri, 21 Jan 2022 14:29:28 -0800 Subject: [PATCH 2/4] Fix flake8 lints Signed-off-by: Shane Loretz --- bin/colcon | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/colcon b/bin/colcon index b1d93434..b003fc2c 100755 --- a/bin/colcon +++ b/bin/colcon @@ -106,8 +106,8 @@ custom_entry_points.update({ # since they can't be queried through pkg_resources without installing }, 'colcon_core.shell.find_installed_packages': { - 'colcon_isolated' : IsolatedInstalledPackageFinder, - 'colcon_merged' : MergedInstalledPackageFinder, + 'colcon_isolated': IsolatedInstalledPackageFinder, + 'colcon_merged': MergedInstalledPackageFinder, }, 'colcon_core.package_augmentation': { 'python': PythonPackageAugmentation, From c7014992a70a4606a28d492f205d36beed83d3b6 Mon Sep 17 00:00:00 2001 From: Shane Loretz Date: Fri, 21 Jan 2022 16:01:42 -0800 Subject: [PATCH 3/4] Alphabetize Signed-off-by: Shane Loretz --- bin/colcon | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/colcon b/bin/colcon index b003fc2c..32b8efc3 100755 --- a/bin/colcon +++ b/bin/colcon @@ -105,10 +105,6 @@ custom_entry_points.update({ # there is no point in registering the extension_point extensions here # since they can't be queried through pkg_resources without installing }, - 'colcon_core.shell.find_installed_packages': { - 'colcon_isolated': IsolatedInstalledPackageFinder, - 'colcon_merged': MergedInstalledPackageFinder, - }, 'colcon_core.package_augmentation': { 'python': PythonPackageAugmentation, }, @@ -132,6 +128,10 @@ custom_entry_points.update({ 'dsv': DsvShell, 'sh': ShShell, }, + 'colcon_core.shell.find_installed_packages': { + 'colcon_isolated': IsolatedInstalledPackageFinder, + 'colcon_merged': MergedInstalledPackageFinder, + }, 'colcon_core.task.build': { 'python': PythonBuildTask, }, From 4974d35a136594d4204d8bd55a1108f969eaae7e Mon Sep 17 00:00:00 2001 From: Shane Loretz Date: Fri, 21 Jan 2022 17:16:47 -0800 Subject: [PATCH 4/4] Don't load non-essential extensions Signed-off-by: Shane Loretz --- bin/colcon | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/bin/colcon b/bin/colcon index 32b8efc3..b2a7ce5c 100755 --- a/bin/colcon +++ b/bin/colcon @@ -65,10 +65,6 @@ from colcon_core.prefix_path.colcon import ColconPrefixPath # noqa: E402 from colcon_core.shell import ALL_SHELLS_ENVIRONMENT_VARIABLE # noqa: E402 from colcon_core.shell.bat import BatShell # noqa: E402 from colcon_core.shell.dsv import DsvShell # noqa: E402 -from colcon_core.shell.installed_packages \ - import IsolatedInstalledPackageFinder # noqa: E402 -from colcon_core.shell.installed_packages \ - import MergedInstalledPackageFinder # noqa: E402 from colcon_core.shell.sh import ShShell # noqa: E402 from colcon_core.task.python.build import PythonBuildTask # noqa: E402 from colcon_core.task.python.test import PythonTestTask # noqa: E402 @@ -129,8 +125,7 @@ custom_entry_points.update({ 'sh': ShShell, }, 'colcon_core.shell.find_installed_packages': { - 'colcon_isolated': IsolatedInstalledPackageFinder, - 'colcon_merged': MergedInstalledPackageFinder, + # Not essential for bootstrapping }, 'colcon_core.task.build': { 'python': PythonBuildTask,