Version 0.21. Fixed to error message and improved ascp version check.

Author: victor73

CHANGES

@@ -1,6 +1,15 @@
+cutlass 0.21
+
+ * Change to exception message related to linkages of
+   MicrobTranscriptomicsRawSeqSet nodes reported by @cometsong.
+ * Aspera version check fixed to cope with older version of ascp
+   reported by @parikhhi.
+
+ - Victor <victor73@github.com>  Mon, 19 Sep 2016 14:00:00 -0400
+
 cutlass 0.20
 
- * Changes to Sample by @cometson to fix name attribute.
+ * Changes to Sample by @cometsong to fix name attribute.
  * Fixed problem identified by @parikhhi with Sample links.
 
  - Victor <victor73@github.com>  Thu, 01 Sep 2016 17:00:00 -0400
@@ -13,7 +22,7 @@ cutlass 0.19.1
 
 cutlass 0.19
 
- * Closed CUTLASS-3 problem with searches reported by Benjamin Leopold.
+ * Closed CUTLASS-3 problem with searches reported by @comentsong.
  * Also addressed search() method for the other classes.
  * Fixed minor issue with test_aspera.py unit test and moved round-trip test
    script to tests/bin subdirectory to avoid conflict with unittest module and

cutlass/MicrobTranscriptomicsRawSeqSet.py

@@ -93,7 +93,7 @@ def validate(self):
             problems.append("Local file does not point to an actual file.")
 
         if 'sequenced_from' not in self._links.keys():
-            problems.append("Must add a 'sequenced_from' link to a host_seq_prep.")
+            problems.append("Must add a 'sequenced_from' link to a wgs_dna_prep.")
 
         self.logger.debug("Number of validation problems: %s." % len(problems))
 

cutlass/aspera/aspera.py

@@ -40,13 +40,12 @@ def get_ascp_version(ascp_command):
     logger.debug("In get_ascp_version.")
 
     version = None
-    retval = subprocess.check_output([ascp_command, "--version"],
+    output = subprocess.check_output([ascp_command, "--version"],
                                      universal_newlines = True)
-    cre = re.compile(r"^.*ascp version (\d[\d\.]+)", re.MULTILINE)
-    for match in cre.finditer(retval):
+    cre = re.compile(r"^.+version (\d[\d\.]+)", re.MULTILINE)
+    for match in cre.finditer(output):
         version = match.groups()[0]
 
-    # raise an exception if the expected string couldn't be matched
     if version is None:
         raise Exception("Output from ascp command ('" + ascp_command + \
                         " --version') did not contain a recognizable " + \