commonnexus 1.5.0__py2.py3-none-any.whl → 1.6.0__py2.py3-none-any.whl

commonnexus/__init__.py

@@ -1,4 +1,4 @@
 from .nexus import Nexus, Config  # noqa: F401
 from commonnexus.blocks import Block  # noqa: F401
 
-__version__ = '1.5.0'
+__version__ = '1.6.0'

commonnexus/tools/normalise.py

@@ -17,6 +17,9 @@ In addition, after normalisation, the following assumptions hold:
 - The ";" terminating MATRIX commands is on a separate line, allowing more simplistic parsing
   of matrix rows.
 """
+import typing
+import collections
+
 from commonnexus import Nexus
 from commonnexus.blocks.characters import Data
 from commonnexus.blocks import Taxa, Distances, Characters, Trees
@@ -24,12 +27,14 @@ from commonnexus.blocks import Taxa, Distances, Characters, Trees
 
 def normalise(nexus: Nexus,
               data_to_characters: bool = False,
-              strip_comments: bool = False) -> Nexus:
+              strip_comments: bool = False,
+              remove_taxa: typing.Optional[typing.Container[str]] = None) -> Nexus:
     """
     :param nexus: A `Nexus` object to be normalised in-place.
     :param data_to_characters: Flag signaling whether DATA blocks should be converted to CHARACTER \
     blocks.
     :param strip_comments: Flag signaling whether to remove all non-command comments.
+    :param remove_taxa: Container of taxon labels specifying taxa to remove from relevant blocks.
     :return: The modified `Nexus` object.
 
     .. code-block:: python
@@ -87,6 +92,8 @@ def normalise(nexus: Nexus,
         TREE 1 = (t1,t2,t3);
         END;
     """
+    remove_taxa = remove_taxa or []
+
     if strip_comments:
         nexus = Nexus([cmd.without_comments() for cmd in nexus], config=nexus.cfg)
     nexus = Nexus([cmd.with_normalised_whitespace() for cmd in nexus], config=nexus.cfg)
@@ -95,6 +102,7 @@ def normalise(nexus: Nexus,
     if nexus.characters:
         matrix = nexus.characters.get_matrix()
         taxlabels = list(matrix.keys())
+        matrix = collections.OrderedDict((k, v) for k, v in matrix.items() if k not in remove_taxa)
         characters = nexus.DATA or nexus.CHARACTERS
         cls = Data if characters.name == 'DATA' and not data_to_characters else Characters
         nexus.replace_block(
@@ -107,19 +115,26 @@ def normalise(nexus: Nexus,
             assert set(matrix.keys()).issubset(taxlabels)
         else:
             taxlabels = list(matrix.keys())
+        matrix = collections.OrderedDict(
+            (k, collections.OrderedDict((kk, vv) for kk, vv in v.items() if kk not in remove_taxa))
+            for k, v in matrix.items() if k not in remove_taxa)
         nexus.replace_block(nexus.DISTANCES, Distances.from_data(matrix))
 
     if nexus.TREES:
         trees = []
         for tree in nexus.TREES.trees:
             nwk = nexus.TREES.translate(tree) if nexus.TREES.TRANSLATE else tree.newick
+            if remove_taxa:
+                nwk.prune_by_names(remove_taxa)
             trees.append((tree.name, nwk, tree.rooted))
         nexus.replace_block(nexus.TREES, Trees.from_data(*trees))
 
     if taxlabels:
+        taxa = Taxa.from_data([t for t in taxlabels if t not in remove_taxa])
         if nexus.TAXA:
             assert nexus.TAXA.DIMENSIONS.ntax == len(taxlabels)
             assert set(nexus.TAXA.TAXLABELS.labels.values()) == set(taxlabels)
+            nexus.replace_block(nexus.TAXA, taxa)
         else:
-            nexus.prepend_block(Taxa.from_data(taxlabels))
+            nexus.prepend_block(taxa)
     return nexus

{commonnexus-1.5.0.dist-info → commonnexus-1.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: commonnexus
-Version: 1.5.0
+Version: 1.6.0
 Summary: A nexus (phylogenetics) file reader and writer (.nex, .trees)
 Home-page: https://github.com/dlce-eva/commonnexus
 Author: Robert Forkel

{commonnexus-1.5.0.dist-info → commonnexus-1.6.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-commonnexus/__init__.py,sha256=gGMpj_J8cxerva1vQVbfuUW6mbo-MNm99ACRYygHg9w,121
+commonnexus/__init__.py,sha256=Tr84gK3MelAO7U__8dpEsLEXy_JmiX9NmCvX1wg8gzw,121
 commonnexus/__main__.py,sha256=k07DsoCHCRw2Wi0HzXCmvNCSt8cddDEGCBlnHZorm6k,4361
 commonnexus/cli_util.py,sha256=pmqd3Fs2Wef7hRf0Z6koZ1Bg6-16FZUMOYZ8cMTY5Ig,3710
 commonnexus/command.py,sha256=5ZbW3wQY1GO6fChK7aqOzwjKBRxkPlKdUf09JbYEy9c,4284
@@ -27,10 +27,10 @@ commonnexus/commands/trees.py,sha256=aMN9WPvzOXfNgPcLvwmkJHtyvjq3LWWo2rpbGFCyczs
 commonnexus/tools/__init__.py,sha256=X8dv4VrjAo5C8VJdUXMrKviDLUrwXbawE5SJiQ--2uQ,213
 commonnexus/tools/combine.py,sha256=CZ0JsJa8azPv6XWuUAHLGOMI0N8EYPY11ipJfTCiRUs,3061
 commonnexus/tools/matrix.py,sha256=3e2n_beug3MZyzXDgawjxxh1QfiM7KVp757OepCjQR0,11492
-commonnexus/tools/normalise.py,sha256=EOUi-w25X_ZZI6iuAU6Zat6UoA4mNlRJli0ESnmDBSQ,4192
-commonnexus-1.5.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-commonnexus-1.5.0.dist-info/METADATA,sha256=nQ1FBxFrIZQ10T_bOFxEci_zK8nWWeHnrJLp3hCUHaI,5328
-commonnexus-1.5.0.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
-commonnexus-1.5.0.dist-info/entry_points.txt,sha256=0CbsOaqe6jaHnG1rpheuIISCZvFp1G1oBgDym82rpAo,58
-commonnexus-1.5.0.dist-info/top_level.txt,sha256=SiWuQrmGciG5Ivhrqz6ueU1Sxv-fzudflsMof81-I54,12
-commonnexus-1.5.0.dist-info/RECORD,,
+commonnexus/tools/normalise.py,sha256=l7MNBkFQk0hyl2IA33AvRFS0mjAZwDYumpfw8pzzMa0,4924
+commonnexus-1.6.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+commonnexus-1.6.0.dist-info/METADATA,sha256=dRy1hWD10vl597dRpdzmI4OiSs0FkqE61KDC9ClZF5E,5328
+commonnexus-1.6.0.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
+commonnexus-1.6.0.dist-info/entry_points.txt,sha256=0CbsOaqe6jaHnG1rpheuIISCZvFp1G1oBgDym82rpAo,58
+commonnexus-1.6.0.dist-info/top_level.txt,sha256=SiWuQrmGciG5Ivhrqz6ueU1Sxv-fzudflsMof81-I54,12
+commonnexus-1.6.0.dist-info/RECORD,,