Skip to content

Commit

Permalink
Merge pull request #39 from Carreau/test-dendrolink
Browse files Browse the repository at this point in the history
Example Crosslink documentation with Dendropy.
  • Loading branch information
mkandziora committed Dec 1, 2018
2 parents e5a06e6 + 0dd762f commit a55ed37
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,4 +202,5 @@
# -- Options for intersphinx extension ---------------------------------------

# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {'https://docs.python.org/': None}
intersphinx_mapping = {'py': ('https://docs.python.org/',None),
'dp': ('https://dendropy.org/', None)}
2 changes: 1 addition & 1 deletion physcraper/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ class AlignTreeTax(object):
* **newick**: dendropy.tre.as_string(schema=schema_trf) object
* **otu_dict**: json file including the otu_dict information generated earlier
* **alignment**: dendropy DNACharacterMatrix object
* **alignment**: dendropy :class:`DnaCharacterMatrix <dendropy.datamodel.charmatrixmodel.DnaCharacterMatrix>` object
* **ingroup_mrca**: OToL identifier of the group of interest, either subclade as defined by user or of all tiplabels in the phylogeny
* **workdir**: the path to the corresponding working directory
* **schema**: optional argument to define tre file schema, if different from "newick"
Expand Down

0 comments on commit a55ed37

Please sign in to comment.