From 08e32a7dc923228c62114cc2ce74b45b840b3424 Mon Sep 17 00:00:00 2001 From: Alexandre Detiste Date: Wed, 28 Aug 2024 10:50:20 +0200 Subject: [PATCH] ete3 does not need six anymore for a long time https://github.com/etetoolkit/ete/pull/597/files --- README.md | 3 +-- README_pypi.md | 3 +-- docs/tex/scoary_manual.tex | 7 +++---- requirements.txt | 1 - scoary/nwkhandler.py | 3 +-- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 7b8cae9..8c8b936 100644 --- a/README.md +++ b/README.md @@ -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) diff --git a/README_pypi.md b/README_pypi.md index 4a44403..e8a9ef7 100644 --- a/README_pypi.md +++ b/README_pypi.md @@ -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) diff --git a/docs/tex/scoary_manual.tex b/docs/tex/scoary_manual.tex index a00d45d..d852201 100644 --- a/docs/tex/scoary_manual.tex +++ b/docs/tex/scoary_manual.tex @@ -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) @@ -473,4 +472,4 @@ \bibliography{citations} \bibliographystyle{unsrt} -\end{document} \ No newline at end of file +\end{document} diff --git a/requirements.txt b/requirements.txt index d0ecf00..f049fdd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ scipy argparse ete3 -six diff --git a/scoary/nwkhandler.py b/scoary/nwkhandler.py index 0073995..e3cb257 100644 --- a/scoary/nwkhandler.py +++ b/scoary/nwkhandler.py @@ -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): """