Merge pull request #181 from singularityhub/fix-comments-bug-180

Fixing parsing bug with singularity cli

Author: vsoch

CHANGELOG.md

@@ -17,8 +17,9 @@ The client here will eventually be released as "spython" (and eventually to
 singularity on pypi), and the versions here will coincide with these releases.
 
 ## [master](https://github.com/singularityhub/singularity-cli/tree/master)
- - ensure options and args from instance init are honored (0.0.15)
- - choose output for stream_command (0.0.14)
+ - fixing bug with defining comments earlier (0.1.16)
+ - ensure options and args from instance init are honored (0.1.15)
+ - choose output for stream_command (0.1.14)
  - adding support to pull from a url (0.1.13)
  - add more verbosity to instance start/stop (0.1.12)
  - adding more verbosity to running commands (0.1.11)

spython/main/parse/parsers/singularity.py

@@ -304,6 +304,8 @@ def load_recipe(self):
         lines = self.lines[:]
         fromHeader = None
         stage = None
+        section = None
+        comments = []
 
         while lines:
 
@@ -314,8 +316,6 @@ def load_recipe(self):
             # Bootstrap Line
             if re.search("bootstrap", line, re.IGNORECASE):
                 self._check_bootstrap(stripped)
-                section = None
-                comments = []
 
             # From Line
             elif re.search("from:", stripped, re.IGNORECASE):

spython/version.py

@@ -5,7 +5,7 @@
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-__version__ = "0.1.15"
+__version__ = "0.1.16"
 AUTHOR = "Vanessa Sochat"
 AUTHOR_EMAIL = "[email protected]"
 NAME = "spython"