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

{spadix-cli-0.7.2/spadix_cli.egg-info → spadix_cli-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spadix-cli
-Version: 0.7.2
+Version: 0.7.4
 Summary: SAF friendly wrapper for colcon
 Home-page: https://safeai.ai
 Author: Serge Nikulin
@@ -15,6 +15,8 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: setuptools
+Requires-Dist: lark
 
 # Spadix, a friendly wrapper for `colcon`
 

{spadix-cli-0.7.2 → spadix_cli-0.7.4}/setup.py

@@ -7,9 +7,9 @@ with open('README.md', 'r', encoding='utf-8') as fh:
 
 setuptools.setup(
     name='spadix-cli',
-    version='0.7.2',
+    version='0.7.4',
     packages=setuptools.find_packages(exclude=['test']),
-    install_requires=['setuptools'],
+    install_requires=['setuptools', 'lark'],
     package_data={'': []},
     author='Serge Nikulin',
     author_email='serge@safeai.ai',

{spadix-cli-0.7.2 → spadix_cli-0.7.4}/spadix_cli/__init__.py

@@ -26,7 +26,7 @@ from sys import stderr
 
 from lark import Lark, Transformer, v_args
 
-__version__ = '0.7.2'
+__version__ = '0.7.4'
 
 ###############################################################################
 USAGE = """
@@ -41,6 +41,7 @@ spadix [Global options] [command] [command options] ...
 --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
 --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
 
 Commands:
 clean  :Clean all packages (`rm -rf log install build`)
@@ -245,6 +246,7 @@ class command_line_parser:
         self.dry_run = False
         self.is_test = False
         self.is_parallel_overridden = False
+        self.use_ninja = False
 
     ###########################################################################
     # Extract global options form the provided arguments
@@ -262,6 +264,8 @@ class command_line_parser:
                         self.no_root_check = True
                     elif arg == '--dry-run':
                         self.dry_run = True
+                    elif arg == '--ninja':
+                        self.use_ninja = True
                     else:
                         self.cmd_line.append(arg)
                 else:
@@ -306,6 +310,8 @@ class command_line_parser:
         expect_cmake_args = False
 
         cmake_args = ['--cmake-args']
+        if self.use_ninja:
+            cmake_args.append(" -GNinja")
 
         is_debug = False
         if is_windows():
@@ -364,7 +370,7 @@ class command_line_parser:
                         self.cmd_line.extend(RM_DIRS_WIN)
                     else:
                         self.cmd_line.extend(RM_DIRS_UNX)
-                    self.cmd_line.extend(['docs', 'latex', 'CTCHTML', 'coverage',
+                    self.cmd_line.extend(['latex', 'CTCHTML', 'coverage',
                                           self.LOG_BASE, self.INSTALL_BASE, self.BUILD_BASE])
                 elif arg.startswith('clean:'):
                     self.cmd_line = []
@@ -424,7 +430,7 @@ class command_line_parser:
                         self.pre_cmd_line.extend(RM_DIRS_WIN)
                     else:
                         self.pre_cmd_line.extend(RM_DIRS_UNX)
-                    self.pre_cmd_line.extend(['docs', 'latex', 'CTCHTML', 'coverage',
+                    self.pre_cmd_line.extend(['latex', 'CTCHTML', 'coverage',
                                               self.LOG_BASE, self.INSTALL_BASE, self.BUILD_BASE])
                     self.cmd_line.append('build')
                     self.add_console_and_merge()
@@ -525,8 +531,10 @@ class command_line_parser:
             if is_debug:
                 cmake_args.append(' -DCMAKE_BUILD_TYPE=Debug')
             else:
-                cmake_args.append(' -DCMAKE_BUILD_TYPE=RelWithDebInfo')
-            self.cmd_line.extend(cmake_args)
+                cmake_args.append(' -DCMAKE_BUILD_TYPE=Release')
+
+            if len(cmake_args) > 1:
+                self.cmd_line.extend(cmake_args)
 
         if self.is_test and (not self.is_parallel_overridden):
             self.cmd_line.extend(['--parallel-workers', '1'])
@@ -588,9 +596,10 @@ def main():
 
     if os.path.exists('.spadixrc'):
         with open('.spadixrc', 'rt', encoding='utf-8') as f:
-            argv = f.readlines()
-            for i in range(0, len(argv)):
-                argv[i] = argv[i].rstrip()
+            lines = f.readlines()
+            for line in lines:
+                if len(line.rstrip(' \n\t\r')) > 0:
+                    argv.append(line.rstrip(' \n\t\r'))
 
     for arg in sys.argv[1:]:
         argv.append(arg)
@@ -601,7 +610,7 @@ def main():
         print('--------------------------------------------------------------')
         print(USAGE.format(version=__version__))
         return retval.returncode
-    elif(argv[0] == '--version'):
+    elif '--version' in argv:
         print(__version__)
         return 0
 

{spadix-cli-0.7.2 → spadix_cli-0.7.4/spadix_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spadix-cli
-Version: 0.7.2
+Version: 0.7.4
 Summary: SAF friendly wrapper for colcon
 Home-page: https://safeai.ai
 Author: Serge Nikulin
@@ -15,6 +15,8 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: setuptools
+Requires-Dist: lark
 
 # Spadix, a friendly wrapper for `colcon`
 

{spadix-cli-0.7.2 → spadix_cli-0.7.4}/spadix_cli.egg-info/requires.txt

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