spadix-cli 0.7.4__py3-none-any.whl → 0.7.6__py3-none-any.whl

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/__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.dist-info → spadix_cli-0.7.6.dist-info}/METADATA

@@ -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.6.dist-info/RECORD

@@ -0,0 +1,8 @@
+spadix_cli/__init__.py,sha256=duX95POquKI0o8ZScCQ0dIbhM1ixPPK_MdpO-8lKX18,24699
+spadix_cli/__main__.py,sha256=7uY4Swdt6Tv6oFGnYjpa15qrtmwhSt4d6y-UqNefM2U,759
+spadix_cli-0.7.6.dist-info/licenses/LICENSE,sha256=AU8-aFax2NopH_n1ja1fXDdqCOJWpuASgSgOIm5Z55w,1083
+spadix_cli-0.7.6.dist-info/METADATA,sha256=DkMfMIYahq6OabhcWtx3gWhtX9RiUBFcVKLEL42uis0,3138
+spadix_cli-0.7.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+spadix_cli-0.7.6.dist-info/entry_points.txt,sha256=oUDP6DnZCF5Ynkmodv1uKAoWK_uFmly093arRd7H3f0,52
+spadix_cli-0.7.6.dist-info/top_level.txt,sha256=2nIIYCRacGMBV3v38jf8tNUxx52VlCJSoklnyuF2H5A,11
+spadix_cli-0.7.6.dist-info/RECORD,,

{spadix_cli-0.7.4.dist-info → spadix_cli-0.7.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.2)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{spadix_cli-0.7.4.dist-info → spadix_cli-0.7.6.dist-info/licenses}/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.dist-info/RECORD

@@ -1,8 +0,0 @@
-spadix_cli/__init__.py,sha256=9HpFTG4LtBSh0nFCWO37mgYg2GACJ731HuQz7AdG1NI,24059
-spadix_cli/__main__.py,sha256=rPu64Cx0WavfzKIa5PAHEfBhOL37eaSYC3NGC7b-Lxc,728
-spadix_cli-0.7.4.dist-info/LICENSE,sha256=Mibvrd1h1r-JGmJDpdKRxcyy_QQXVYvC3IkOd_MEHKE,1049
-spadix_cli-0.7.4.dist-info/METADATA,sha256=CTCPrJtaZjfov4HieG8UvnX8yfgYpbEbI6Ko7diDilc,2675
-spadix_cli-0.7.4.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-spadix_cli-0.7.4.dist-info/entry_points.txt,sha256=oUDP6DnZCF5Ynkmodv1uKAoWK_uFmly093arRd7H3f0,52
-spadix_cli-0.7.4.dist-info/top_level.txt,sha256=2nIIYCRacGMBV3v38jf8tNUxx52VlCJSoklnyuF2H5A,11
-spadix_cli-0.7.4.dist-info/RECORD,,