Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ete3 does not need six anymore for a long time #111

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@ All changes are logged in the [CHANGELOG](CHANGELOG.md)
#### If you supply custom trees (Optional)

- ete3
- six

Note that ete3 and six are not automatically installed. You can do `pip install ete3 six` to get them
Note that ete3 is not automatically installed. You can do `pip install ete3` to get it

#### Using the GUI (Optional)

Expand Down
3 changes: 1 addition & 2 deletions README_pypi.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ Dependencies
If you supply custom trees (Optional)

- ete3
- six

Note that ete3 and six are not automatically installed. You can do `pip install ete3 six` to get them
Note that ete3 is not automatically installed. You can do `pip install ete3` to get it

Using the GUI (Optional)

Expand Down
7 changes: 3 additions & 4 deletions docs/tex/scoary_manual.tex
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,12 @@
\begin{itemize}

\item ete3
\item six

\end{itemize}

\noindent Note that ete3 and six are not automatically installed. To get them use
\noindent Note that ete3 is not automatically installed. To get it use
\begin{lstlisting}[language=python, basicstyle=\small]
$ pip install ete3 six
$ pip install ete3
\end{lstlisting}

\noindent Using the GUI (Optional)
Expand Down Expand Up @@ -473,4 +472,4 @@
\bibliography{citations}
\bibliographystyle{unsrt}

\end{document}
\end{document}
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
scipy
argparse
ete3
six
3 changes: 1 addition & 2 deletions scoary/nwkhandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
try:
from ete3 import Tree
from ete3.parser.newick import NewickError
import six
except ImportError:
sys.exit("ERROR: Could not import ete3. You need 'ete3' AND 'six' installed to read custom trees.")
sys.exit("ERROR: Could not import ete3. You need 'ete3' installed to read custom trees.")

def ReadTreeFromFile(filepath):
"""
Expand Down