Disable install of pinned ncurses

Updated rapidjon & python-rapidjson
Fix cmake tests
Added additional log messages for debugging the passing of filenames with spaces to cmake

Author: langmm

.github/workflows/test-install.yml

@@ -502,9 +502,6 @@ jobs:
         ${{ env.PYTHONVERSION }}
 
         '
-    - if: runner.os == 'Linux' && matrix.install-sbml == true
-      name: (LINUX) Install ncurses 5 for SBML runs with libroadrunner
-      run: sudo apt-get install libncurses5 libncurses5-dev libncursesw5-dev
     - continue-on-error: true
       id: conda_install
       if: matrix.install-method == 'conda' || matrix.install-method == 'mamba'
@@ -917,9 +914,6 @@ jobs:
         ${{ env.PYTHONVERSION }}
 
         '
-    - if: runner.os == 'Linux' && matrix.install-sbml == true
-      name: (LINUX) Install ncurses 5 for SBML runs with libroadrunner
-      run: sudo apt-get install libncurses5 libncurses5-dev libncursesw5-dev
     - continue-on-error: true
       id: conda_install
       if: matrix.install-method == 'conda' || matrix.install-method == 'mamba'
@@ -1308,9 +1302,6 @@ jobs:
         ${{ env.PYTHONVERSION }}
 
         '
-    - if: runner.os == 'Linux' && matrix.install-sbml == true
-      name: (LINUX) Install ncurses 5 for SBML runs with libroadrunner
-      run: sudo apt-get install libncurses5 libncurses5-dev libncursesw5-dev
     - continue-on-error: true
       id: conda_install
       if: matrix.install-method == 'conda' || matrix.install-method == 'mamba'
@@ -1680,9 +1671,6 @@ jobs:
         ${{ env.PYTHONVERSION }}
 
         '
-    - if: runner.os == 'Linux' && matrix.install-sbml == true
-      name: (LINUX) Install ncurses 5 for SBML runs with libroadrunner
-      run: sudo apt-get install libncurses5 libncurses5-dev libncursesw5-dev
     - continue-on-error: true
       id: conda_install
       if: matrix.install-method == 'conda' || matrix.install-method == 'mamba'
@@ -2051,9 +2039,6 @@ jobs:
         ${{ env.PYTHONVERSION }}
 
         '
-    - if: runner.os == 'Linux' && matrix.install-sbml == true
-      name: (LINUX) Install ncurses 5 for SBML runs with libroadrunner
-      run: sudo apt-get install libncurses5 libncurses5-dev libncursesw5-dev
     - continue-on-error: true
       id: conda_install
       if: matrix.install-method == 'conda' || matrix.install-method == 'mamba'

tests/drivers/test_CMakeModelDriver.py

@@ -44,7 +44,8 @@ def test_CMakeModelDriver_no_cmake(scripts):  # pragma: windows
 @pytest.mark.absent_language('c++')
 def test_CMakeModelDriver_no_C_library(scripts):  # pragma: windows
     r"""Test CMakeModelDriver error when C++ library not installed."""
-    with pytest.raises(RuntimeError):
+    from yggdrasil.drivers.BuildModelDriver import BuildError
+    with pytest.raises(BuildError):
         CMakeModelDriver('test', scripts['cmake'])
 
 
@@ -145,5 +146,7 @@ def instance_kwargs(self, testing_options, timeout, sourcedir,
                     namespace=namespace, env_compiler='CXX',
                     env_compiler_flags='CXXFLAGS',
                     sourcedir='.', builddir='build',
+                    configurer_flags=[
+                        '-DPATH_WITH_SPACE:FILENAME="/Path Space/file"'],
                     compiler_flags=['-Wdev'], skip_compiler=True,
                     remove_products=True)

utils/test-install-base.yml

@@ -300,9 +300,9 @@ jobs:
     # - name: (MACOS,CONDA) Install old MacOSX SDK for compatibility with the conda llvm (7)
     #   if: runner.os == 'macOS' && (matrix.install-method == 'conda' || matrix.install-method == 'mamba')
     #   run: ./utils/setup_old_mac_sdk.sh
-    - name: (LINUX) Install ncurses 5 for SBML runs with libroadrunner
-      if: runner.os == 'Linux' && matrix.install-sbml == true
-      run: sudo apt-get install libncurses5 libncurses5-dev libncursesw5-dev
+    # - name: (LINUX) Install ncurses 5 for SBML runs with libroadrunner
+    #   if: runner.os == 'Linux' && matrix.install-sbml == true
+    #   run: sudo apt-get install libncurses5 libncurses5-dev libncursesw5-dev
     - name: (CONDA) Install dependencies & package from existing build
       id: conda_install
       continue-on-error: true

yggdrasil/drivers/BuildModelDriver.py

@@ -385,8 +385,10 @@ def init_model_dep(self, **kwargs):
                     components.import_component(
                         'model', self.target_language))
         if not self.target_language_driver.is_installed():
-            raise BuildError(f"Target language \"{self.language}\" is "
-                             f"not installed")
+            raise BuildError(
+                f"Target language "
+                f"\"{self.target_language_driver.language}\" is "
+                f"not installed")
         if self.target_compiler is None:
             self.target_compiler = self.target_language_driver.get_tool(
                 'compiler', return_prop='name')

yggdrasil/drivers/CMakeModelDriver.py

@@ -294,13 +294,18 @@ def fix_flags(cls, flags, **kwargs):
                  parent class.
 
         """
-        if ((isinstance(flags, str)  # and ' ' in flags
-             and kwargs.get('context', None) == 'flag')):
-            if '"' in flags:
-                flags = flags.replace('"', '\\"')
-            flags = f'"{flags}"'
-        print(f"CMakeConfigure FIX_FLAGS: {type(flags)}, {flags}")
-        return super(CMakeConfigure, cls).fix_flags(flags, **kwargs)
+        # if ((isinstance(flags, str)  # and ' ' in flags
+        #      and kwargs.get('context', None) == 'flag')):
+        #     if '"' in flags:
+        #         flags = flags.replace('"', '\\"')
+        #     flags = f'"{flags}"'
+        out = super(CMakeConfigure, cls).fix_flags(flags, **kwargs)
+        print(f"CMakeConfigure FIX_FLAGS: {type(flags)}, {flags}, {out}")
+        if ((isinstance(flags, str) and ' ' in flags
+             and kwargs.get('context', None) == 'cmd')):
+            out = cls.fix_path(out, actions=['doublequote'])
+            print(f"CMakeConfigure FIX_FLAGS OUT: {out}")
+        return out
 
     @classmethod
     def fix_path(cls, path, **kwargs):
@@ -325,8 +330,11 @@ def fix_path(cls, path, **kwargs):
         elif kwargs.get('context', None) == 'flag':
             default_actions = ['forwardslash']
             if ' ' in path:
-                default_actions.append('doublequote')
+                default_actions += ['doublequote']
             kwargs.setdefault('actions', default_actions)
+        # elif kwargs.get('context', None) == 'cmd':
+        #     if ' ' in path:
+        #         kwargs.setdefault('actions', ['doublequote'])
         return super(CMakeConfigure, cls).fix_path(path, **kwargs)
 
 

yggdrasil/drivers/CompiledModelDriver.py

@@ -4583,11 +4583,19 @@ def fix_path(cls, path, context='flag', tool=None,
         if 'forwardslash' in actions:
             out = out.replace('\\', re.escape('/'))
         if 'doublequote' in actions:
+            if '"' in out:
+                out = out.replace('"', '\\"')
             out = f'"{out}"'
         elif 'singlequote' in actions:
+            if "'" in out:
+                out = out.replace("'", "\\'")
             out = f"'{out}'"
         if 'escapespace' in actions:
             out = out.replace(' ', r'\\ ')
+        if 'escapedoublequote' in actions:
+            out = out.replace('"', '\\"')
+        if 'escapesinglequote' in actions:
+            out = out.replace("'", "\\'")
         # TODO: Add extra backslashes in contexts where string will be
         #   expanded before it is used
         return out
@@ -5645,9 +5653,15 @@ def format_out(name, x, indent=2, wrap=100, tab='  ',
         try:
             if (not skip_flags) and ('env' not in unused_kwargs):
                 unused_kwargs['env'] = cls.set_env()
+            cmd = cls.fix_flags(cmd, context='cmd')
             message_before = (
                 format_out('Working Dir', working_dir)
-                + format_out('Command', f"\"{' '.join(cmd)}\""))
+                + format_out('Raw Command',
+                             pprint.pformat(cmd))
+                + format_out('Command', f"{' '.join(cmd)}")
+                + format_out('Popen Kwargs',
+                             pprint.pformat(unused_kwargs))
+            )
             if not for_version:
                 try:
                     message_before = (