spadix-cli 0.7.4__tar.gz → 0.7.6__tar.gz

{spadix_cli-0.7.4 → spadix_cli-0.7.6}/LICENSE

@@ -1,4 +1,5 @@
-Copyright (c) 2021 SafeAI
+Copyright (C) 2021-2024 SafeAI
+Copyright (C) 2025 Pronto.AI
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{spadix_cli-0.7.4/spadix_cli.egg-info → spadix_cli-0.7.6}/PKG-INFO

@@ -1,26 +1,41 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: spadix-cli
-Version: 0.7.4
-Summary: SAF friendly wrapper for colcon
-Home-page: https://safeai.ai
+Version: 0.7.6
+Summary: A friendly wrapper for colcon
+Home-page: https://pronto.ai
 Author: Serge Nikulin
-Author-email: serge@safeai.ai
+Author-email: serge.nikulin@pronto.ai
 Maintainer: Serge Nikulin
-Maintainer-email: serge@safeai.ai
-Project-URL: Bug Tracker, https://gitlab.safeai.ai/production/spadix-cli
+Maintainer-email: serge.nikulin@pronto.ai
+Project-URL: Bug Tracker, https://github.com/Pronto-ai/spadix
 Keywords: spadix-cli
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: setuptools
-Requires-Dist: lark
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # Spadix, a friendly wrapper for `colcon`
 
-Copyright (C) 2021 SafeAI
+Copyright (C) 2021-2024 SafeAI
+
+Copyright (C) 2025 Pronto.AI
 
 ## Why?
 
@@ -50,9 +65,11 @@ Usage:
 spadix [Global options] [command] [command options] ...
 
 [Global options]
---no-merge  : Don't use --merge-install option for colcon
---no-console  : Don't use the default console mode: `--event-handlers console_direct+`
---no-root-check  : Don't check that spadix being started from the root of a git project
+--no-merge  : Do not use --merge-install option for colcon
+--no-console  : Do not use the default console mode: `--event-handlers console_cohesion+`
+--no-root-check  : Do not check that spadix being started from the root of a git project
+--ninja  : Use Ninja for building when available
+--non-ninja  : Do not use Ninja for building, even if it is available
 
 Commands:
 clean  :Clean all projects (essentially executes `rm -rf log install build`)

{spadix_cli-0.7.4 → spadix_cli-0.7.6}/README.md

@@ -1,6 +1,8 @@
 # Spadix, a friendly wrapper for `colcon`
 
-Copyright (C) 2021 SafeAI
+Copyright (C) 2021-2024 SafeAI
+
+Copyright (C) 2025 Pronto.AI
 
 ## Why?
 
@@ -30,9 +32,11 @@ Usage:
 spadix [Global options] [command] [command options] ...
 
 [Global options]
---no-merge  : Don't use --merge-install option for colcon
---no-console  : Don't use the default console mode: `--event-handlers console_direct+`
---no-root-check  : Don't check that spadix being started from the root of a git project
+--no-merge  : Do not use --merge-install option for colcon
+--no-console  : Do not use the default console mode: `--event-handlers console_cohesion+`
+--no-root-check  : Do not check that spadix being started from the root of a git project
+--ninja  : Use Ninja for building when available
+--non-ninja  : Do not use Ninja for building, even if it is available
 
 Commands:
 clean  :Clean all projects (essentially executes `rm -rf log install build`)

{spadix_cli-0.7.4 → spadix_cli-0.7.6}/setup.py

@@ -7,17 +7,17 @@ with open('README.md', 'r', encoding='utf-8') as fh:
 
 setuptools.setup(
     name='spadix-cli',
-    version='0.7.4',
+    version='0.7.6',
     packages=setuptools.find_packages(exclude=['test']),
-    install_requires=['setuptools', 'lark'],
+    install_requires=['setuptools'],
     package_data={'': []},
     author='Serge Nikulin',
-    author_email='serge@safeai.ai',
+    author_email='serge.nikulin@pronto.ai',
     maintainer='Serge Nikulin',
-    maintainer_email='serge@safeai.ai',
-    url='https://safeai.ai',
+    maintainer_email='serge.nikulin@pronto.ai',
+    url='https://pronto.ai',
     project_urls={
-        'Bug Tracker': 'https://gitlab.safeai.ai/production/spadix-cli',
+        'Bug Tracker': 'https://github.com/Pronto-ai/spadix',
     },
     keywords=['spadix-cli'],
     classifiers=[
@@ -25,10 +25,10 @@ setuptools.setup(
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
     ],
-    description='SAF friendly wrapper for colcon',
+    description='A friendly wrapper for colcon',
     long_description=long_description,
     long_description_content_type='text/markdown',
-    python_requires='>=3.6',
+    python_requires='>=3.8',
     tests_require=['pytest'],
     test_suite='test',
     entry_points={

{spadix_cli-0.7.4 → spadix_cli-0.7.6}/spadix_cli/__init__.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 # Copyright 2019-2023 SafeAI, Inc.
+# Copyright (C) 2025 Pronto.AI
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,11 +27,12 @@ from sys import stderr
 
 from lark import Lark, Transformer, v_args
 
-__version__ = '0.7.4'
+__version__ = '0.7.6'
 
 ###############################################################################
 USAGE = """
-Copyright (C) 2019--2023 SafeAI, by Serge Nikulin
+Copyright (C) 2019-2024 SafeAI, Inc.
+Copyright (C) 2025 Pronto.AI
 spadix version {version} is a friendly wrapper for colcon (collective construction build manager)
 
 Usage:
@@ -38,10 +40,11 @@ spadix [Global options] [command] [command options] ...
 
 [Global options]
 --version  : Print spadix\' version and exit`
---no-console  : Don't use the default console mode: `--event-handlers console_direct+`
+--no-console  : Don't use the default console mode: `--event-handlers console_cohesion+`
 --no-root-check  : Don't check that spadix being started from the root of a git project
 --dry-run  : Don't run `colcon` command, instead print the command line and exit
 --ninja    : Use Ninja during the build. Ignored if it's not a build
+--non-ninja  : Do not use Ninja (overrides default on non-Windows)
 
 Commands:
 clean  :Clean all packages (`rm -rf log install build`)
@@ -246,7 +249,7 @@ class command_line_parser:
         self.dry_run = False
         self.is_test = False
         self.is_parallel_overridden = False
-        self.use_ninja = False
+        self.use_ninja = not is_windows()
 
     ###########################################################################
     # Extract global options form the provided arguments
@@ -266,6 +269,8 @@ class command_line_parser:
                         self.dry_run = True
                     elif arg == '--ninja':
                         self.use_ninja = True
+                    elif arg == '--non-ninja':
+                        self.use_ninja = False
                     else:
                         self.cmd_line.append(arg)
                 else:
@@ -277,7 +282,7 @@ class command_line_parser:
             self.cmd_line.append('--merge-install')
         if not self.no_console:
             self.cmd_line.append('--event-handlers')
-            self.cmd_line.append('console_direct+')
+            self.cmd_line.append('console_cohesion+')
 
     ###########################################################################
     def parse_package_list(self, list_string):
@@ -313,6 +318,7 @@ class command_line_parser:
         if self.use_ninja:
             cmake_args.append(" -GNinja")
 
+        user_set_cmake_build_type = False
         is_debug = False
         if is_windows():
             is_debug = True
@@ -331,6 +337,11 @@ class command_line_parser:
                 elif arg == '--cmake-args':
                     expect_cmake_args = True
                     continue
+                elif arg.startswith('-D'):
+                    cmake_args.append(' ' + arg)
+                    if 'CMAKE_BUILD_TYPE' in arg:
+                        user_set_cmake_build_type = True
+                    continue
                 elif arg == '--build-base':
                     self.cmd_line.append(arg)
                     expect_BUILD_BASE = True
@@ -528,10 +539,12 @@ class command_line_parser:
                     self.cmd_line.append(arg)
 
         if self.is_build:
-            if is_debug:
-                cmake_args.append(' -DCMAKE_BUILD_TYPE=Debug')
-            else:
-                cmake_args.append(' -DCMAKE_BUILD_TYPE=Release')
+            if not user_set_cmake_build_type and not any(
+                    'CMAKE_BUILD_TYPE' in a for a in cmake_args):
+                if is_debug:
+                    cmake_args.append(' -DCMAKE_BUILD_TYPE=Debug')
+                else:
+                    cmake_args.append(' -DCMAKE_BUILD_TYPE=RelWithDebInfo')
 
             if len(cmake_args) > 1:
                 self.cmd_line.extend(cmake_args)

{spadix_cli-0.7.4 → spadix_cli-0.7.6}/spadix_cli/__main__.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 # Copyright 2019-2023 SafeAI, Inc.
+# Copyright (C) 2025 Pronto.AI
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{spadix_cli-0.7.4 → spadix_cli-0.7.6/spadix_cli.egg-info}/PKG-INFO

@@ -1,26 +1,41 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: spadix-cli
-Version: 0.7.4
-Summary: SAF friendly wrapper for colcon
-Home-page: https://safeai.ai
+Version: 0.7.6
+Summary: A friendly wrapper for colcon
+Home-page: https://pronto.ai
 Author: Serge Nikulin
-Author-email: serge@safeai.ai
+Author-email: serge.nikulin@pronto.ai
 Maintainer: Serge Nikulin
-Maintainer-email: serge@safeai.ai
-Project-URL: Bug Tracker, https://gitlab.safeai.ai/production/spadix-cli
+Maintainer-email: serge.nikulin@pronto.ai
+Project-URL: Bug Tracker, https://github.com/Pronto-ai/spadix
 Keywords: spadix-cli
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: setuptools
-Requires-Dist: lark
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # Spadix, a friendly wrapper for `colcon`
 
-Copyright (C) 2021 SafeAI
+Copyright (C) 2021-2024 SafeAI
+
+Copyright (C) 2025 Pronto.AI
 
 ## Why?
 
@@ -50,9 +65,11 @@ Usage:
 spadix [Global options] [command] [command options] ...
 
 [Global options]
---no-merge  : Don't use --merge-install option for colcon
---no-console  : Don't use the default console mode: `--event-handlers console_direct+`
---no-root-check  : Don't check that spadix being started from the root of a git project
+--no-merge  : Do not use --merge-install option for colcon
+--no-console  : Do not use the default console mode: `--event-handlers console_cohesion+`
+--no-root-check  : Do not check that spadix being started from the root of a git project
+--ninja  : Use Ninja for building when available
+--non-ninja  : Do not use Ninja for building, even if it is available
 
 Commands:
 clean  :Clean all projects (essentially executes `rm -rf log install build`)

{spadix_cli-0.7.4 → spadix_cli-0.7.6}/spadix_cli.egg-info/requires.txt

@@ -1,2 +1 @@
 setuptools
-lark

{spadix_cli-0.7.4 → spadix_cli-0.7.6}/test/test_units.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 # Copyright 2019-2023 SafeAI, Inc.
+# Copyright (C) 2025 Pronto.AI
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -92,9 +93,18 @@ def test_get_global_options():
     clp = spadix_cli.command_line_parser()
     tst.expect_False(clp.no_console)
     tst.expect_False(clp.no_root_check)
+    tst.expect_eq(clp.use_ninja, not spadix_cli.is_windows())
     tst.expect_eq(clp.cmd_line, ['colcon'])
     tst.expect_eq(clp.arg_idx, 0)
 
+    clp = spadix_cli.command_line_parser()
+    clp.parse_global_options(['--ninja'])
+    tst.expect_True(clp.use_ninja)
+
+    clp = spadix_cli.command_line_parser()
+    clp.parse_global_options(['--non-ninja'])
+    tst.expect_False(clp.use_ninja)
+
     clp = spadix_cli.command_line_parser()
     clp.parse_global_options(None)
     tst.expect_False(clp.no_console)
@@ -245,13 +255,14 @@ def test_parse_command():
     release_specifier = ' -DCMAKE_BUILD_TYPE=RelWithDebInfo'
     if (platform.system() == 'Windows'):
         release_specifier = ' -DCMAKE_BUILD_TYPE=Debug'
+    ninja_cmake_arg = [' -GNinja'] if not spadix_cli.is_windows() else []
 
     clp = spadix_cli.command_line_parser()
     clp.parse_command(['build'])
     tst.expect_eq(clp.arg_idx, 1)
     tst.expect_eq(clp.retval, 0)
-    test_cmd_line = ['colcon', 'build', '--event-handlers', 'console_direct+',
-                     '--cmake-args', release_specifier]
+    test_cmd_line = ['colcon', 'build', '--event-handlers', 'console_cohesion+',
+                     '--cmake-args'] + ninja_cmake_arg + [release_specifier]
     if spadix_cli.is_merged_install('install', '.colcon_install_layout'):
         test_cmd_line.insert(2, '--merge-install')
     tst.expect_eq(clp.cmd_line, test_cmd_line)
@@ -266,9 +277,9 @@ def test_parse_command():
     clp.parse_command(['build:1'])
     tst.expect_eq(clp.arg_idx, 1)
     tst.expect_eq(clp.retval, 0)
-    test_cmd_line = ['colcon', 'build', '--event-handlers', 'console_direct+',
+    test_cmd_line = ['colcon', 'build', '--event-handlers', 'console_cohesion+',
                      '--packages-select', '1',
-                     '--cmake-args', release_specifier]
+                     '--cmake-args'] + ninja_cmake_arg + [release_specifier]
     if spadix_cli.is_merged_install('install', '.colcon_install_layout'):
         test_cmd_line.insert(2, '--merge-install')
     tst.expect_eq(clp.cmd_line, test_cmd_line)
@@ -277,12 +288,12 @@ def test_parse_command():
     clp.parse_command(['build:1.ne.2.eq.3.lt.4.le.5.ge.6.gt.7'])
     tst.expect_eq(clp.arg_idx, 1)
     tst.expect_eq(clp.retval, 0)
-    test_cmd_line = ['colcon', 'build', '--event-handlers', 'console_direct+',
+    test_cmd_line = ['colcon', 'build', '--event-handlers', 'console_cohesion+',
                      '--packages-select', '1', '3',
                      '--packages-skip', '2', '4', '7',
                      '--packages-up-to', '4', '5',
                      '--packages-above', '6', '7',
-                     '--cmake-args', release_specifier]
+                     '--cmake-args'] + ninja_cmake_arg + [release_specifier]
     if spadix_cli.is_merged_install('install', '.colcon_install_layout'):
         test_cmd_line.insert(2, '--merge-install')
     tst.expect_eq(clp.cmd_line, test_cmd_line)
@@ -290,8 +301,8 @@ def test_parse_command():
     clp = spadix_cli.command_line_parser()
     clp.parse_command(['build', '--release'])
     tst.expect_eq(clp.retval, 0)
-    test_cmd_line = ['colcon', 'build', '--event-handlers', 'console_direct+',
-                     '--cmake-args', ' -DCMAKE_BUILD_TYPE=RelWithDebInfo']
+    test_cmd_line = ['colcon', 'build', '--event-handlers', 'console_cohesion+',
+                     '--cmake-args'] + ninja_cmake_arg + [' -DCMAKE_BUILD_TYPE=RelWithDebInfo']
     if spadix_cli.is_merged_install('install', '.colcon_install_layout'):
         test_cmd_line.insert(2, '--merge-install')
     tst.expect_eq(clp.cmd_line, test_cmd_line)
@@ -299,12 +310,19 @@ def test_parse_command():
     clp = spadix_cli.command_line_parser()
     clp.parse_command(['build', '--debug'])
     tst.expect_eq(clp.retval, 0)
-    test_cmd_line = ['colcon', 'build', '--event-handlers', 'console_direct+',
-                     '--cmake-args', ' -DCMAKE_BUILD_TYPE=Debug']
+    test_cmd_line = ['colcon', 'build', '--event-handlers', 'console_cohesion+',
+                     '--cmake-args'] + ninja_cmake_arg + [' -DCMAKE_BUILD_TYPE=Debug']
     if spadix_cli.is_merged_install('install', '.colcon_install_layout'):
         test_cmd_line.insert(2, '--merge-install')
     tst.expect_eq(clp.cmd_line, test_cmd_line)
 
+    # --non-ninja overrides default on non-Windows
+    clp = spadix_cli.command_line_parser()
+    clp.parse_global_options(['--non-ninja', 'build'])
+    clp.parse_command(['--non-ninja', 'build'])
+    tst.expect_eq(clp.retval, 0)
+    tst.expect_False(' -GNinja' in clp.cmd_line)
+
     tst.expect_False('SAFEAI_FIF_DISABLED' in os.environ)
     clp = spadix_cli.command_line_parser()
     clp.parse_command(['build', '--no-fif'])
@@ -321,7 +339,7 @@ def test_parse_command():
     test_cmd_line = ['colcon',
                      'test',
                      '--event-handlers',
-                     'console_direct+',
+                     'console_cohesion+',
                      '--parallel-workers',
                      '1']
     if spadix_cli.is_merged_install('install', '.colcon_install_layout'):
@@ -335,7 +353,7 @@ def test_parse_command():
     test_cmd_line = ['colcon',
                      'test',
                      '--event-handlers',
-                     'console_direct+',
+                     'console_cohesion+',
                      '--executor',
                      'parallel']
     if spadix_cli.is_merged_install('install', '.colcon_install_layout'):
@@ -349,7 +367,7 @@ def test_parse_command():
     test_cmd_line = ['colcon',
                      'test',
                      '--event-handlers',
-                     'console_direct+',
+                     'console_cohesion+',
                      '--parallel-workers',
                      '5']
     if spadix_cli.is_merged_install('install', '.colcon_install_layout'):
@@ -369,7 +387,7 @@ def test_parse_command():
     test_cmd_line = ['colcon',
                      'test',
                      '--event-handlers',
-                     'console_direct+',
+                     'console_cohesion+',
                      '--packages-select',
                      '1',
                      '--parallel-workers',
@@ -382,7 +400,7 @@ def test_parse_command():
     clp.parse_command(['test:2,3,1'])
     tst.expect_eq(clp.arg_idx, 1)
     tst.expect_eq(clp.retval, 0)
-    test_cmd_line = ['colcon', 'test', '--event-handlers', 'console_direct+',
+    test_cmd_line = ['colcon', 'test', '--event-handlers', 'console_cohesion+',
                      '--packages-select', '2', '3', '1',
                      '--parallel-workers', '1']
     if spadix_cli.is_merged_install('install', '.colcon_install_layout'):
@@ -393,7 +411,7 @@ def test_parse_command():
     clp.parse_command(['test::test'])
     tst.expect_eq(clp.arg_idx, 1)
     tst.expect_eq(clp.retval, 0)
-    test_cmd_line = ['colcon', 'test', '--event-handlers', 'console_direct+',
+    test_cmd_line = ['colcon', 'test', '--event-handlers', 'console_cohesion+',
                      '--ctest-args', '-R', 'test',
                      '--parallel-workers', '1']
     if spadix_cli.is_merged_install('install', '.colcon_install_layout'):
@@ -404,7 +422,7 @@ def test_parse_command():
     clp.parse_command(['test:1:test'])
     tst.expect_eq(clp.arg_idx, 1)
     tst.expect_eq(clp.retval, 0)
-    test_cmd_line = ['colcon', 'test', '--event-handlers', 'console_direct+',
+    test_cmd_line = ['colcon', 'test', '--event-handlers', 'console_cohesion+',
                      '--packages-select', '1',
                      '--ctest-args', '-R', 'test',
                      '--parallel-workers', '1']
@@ -416,7 +434,7 @@ def test_parse_command():
     clp.parse_command(['test:1.ne.2.eq.3.lt.4.le.5.ge.6.gt.7:test'])
     tst.expect_eq(clp.arg_idx, 1)
     tst.expect_eq(clp.retval, 0)
-    test_cmd_line = ['colcon', 'test', '--event-handlers', 'console_direct+',
+    test_cmd_line = ['colcon', 'test', '--event-handlers', 'console_cohesion+',
                      '--packages-select', '1', '3',
                      '--packages-skip', '2', '4', '7',
                      '--packages-up-to', '4', '5',