Merge pull request #9 from singularityhub/fix/yaml

bug fix to yaml version

Author: vsoch

CHANGELOG.md

@@ -14,5 +14,6 @@ and **Merged pull requests**. Critical items to know are:
 The versions coincide with releases on pypi.
 
 ## [0.0.x](https://github.com/singularityhub/singularity-compose/tree/master) (0.0.x)
+ - pyaml version should be for newer kind, and still check for attribute (0.0.11)
  - alpha release with simple (single container) working example (0.0.1)
  - dummy release (0.0.0)

scompose/project/instance.py

@@ -206,7 +206,17 @@ def run_post(self):
                 if not isinstance(command, list):
                     command = shlex.split(command)
 
-                self.client._run_command(command, quiet=True)
+                # Capture the return code
+                response = self.client._run_command(command, 
+                                                    quiet=True, 
+                                                    return_result=True)
+                # If debug on, show output
+                bot.debug("".join(response['message']))
+
+                # Alert the user if there is an error
+                if response['return_code'] != 0:
+                    bot.error("".join(response['message']))
+                    bot.exit("Return code %s, exiting." % response['return_code'])
 
 # Image
 

scompose/utils/__init__.py

@@ -149,7 +149,13 @@ def _read_yaml(section, quiet=False):
        section: a string of unparsed yaml content.
     '''
     metadata = {}
-    docs = yaml.load_all(section, Loader=yaml.FullLoader)
+
+    # PyYaml vs pyaml have subtle differences
+    if hasattr(yaml, "FullLoader"):
+        docs = yaml.load_all(section, Loader=yaml.FullLoader)
+    else:
+        docs = yaml.load_all(section)
+
     for doc in docs:
         if isinstance(doc, dict):
             for k, v in doc.items():

scompose/version.py

@@ -17,7 +17,7 @@
 
 '''
 
-__version__ = "0.0.1"
+__version__ = "0.0.11"
 AUTHOR = 'Vanessa Sochat'
 AUTHOR_EMAIL = '[email protected]'
 NAME = 'singularity-compose'
@@ -32,7 +32,7 @@
 
 INSTALL_REQUIRES = (
     ('spython', {'min_version': '0.0.67'}),
-    ('pyaml', {'min_version': '17.12.1'}),
+    ('pyaml', {'min_version': '5.1.1'}),
 )
 
 TESTS_REQUIRES = (