Slightly tweak storing versions of used tools

clade/extensions/abstract.py

@@ -24,6 +24,7 @@
 import platform
 import pkg_resources
 import os
+import re
 import shutil
 import subprocess
 import sys
@@ -357,9 +358,6 @@ def dump_global_meta(self, cmds_file):
         if "cif" not in stored_meta["versions"]:
             stored_meta["versions"]["cif"] = self.get_program_version("cif")
 
-        if "aspectator" not in stored_meta["versions"]:
-            stored_meta["versions"]["aspectator"] = self.get_program_version("aspectator")
-
         if "uuid" not in stored_meta:
             stored_meta["uuid"] = str(uuid.uuid4())
 
@@ -406,6 +404,8 @@ def get_program_version(self, program, version_arg="--version"):
                 [program, version_arg], stderr=subprocess.DEVNULL, universal_newlines=True
             ).strip()
         finally:
+            if version.startswith("gcc"):
+                version = re.sub(r'\nCopyright[\s\S]*', '', version)
             return version
 
     def __get_cmd_chunk(self, cmds, chunk_size=1000):

setup.py

@@ -192,7 +192,7 @@ def finalize_options(self):
 
 setuptools.setup(
     name="clade",
-    version="3.2.7",
+    version="3.2.8",
     author="Ilya Shchepetkov",
     author_email="[email protected]",
     url="https://github.com/17451k/clade",