# HG changeset patch # User gga # Date 1520850596 14400 # Node ID 99b00626720af4b737a4470dcdd3a940660edb61 # Parent b973f3f7b50941acd402c40246b5e5bdb32c4db9 planemo upload for repository https://github.com/galaxy-genome-annotation/galaxy-tools/tree/master/tools/apollo commit 70fbb41d4c6b0a08a7bed4849a5ae7c865e1ab1e diff -r b973f3f7b509 -r 99b00626720a README.rst --- a/README.rst Thu Feb 08 11:36:25 2018 -0500 +++ b/README.rst Mon Mar 12 06:29:56 2018 -0400 @@ -15,7 +15,7 @@ .. code:: bash . /path/to/galaxy/.venv/bin/activate - pip install future biopython bcbio-gff + pip install six biopython bcbio-gff deactivate Environment diff -r b973f3f7b509 -r 99b00626720a create_account.py --- a/create_account.py Thu Feb 08 11:36:25 2018 -0500 +++ b/create_account.py Mon Mar 12 06:29:56 2018 -0400 @@ -4,7 +4,8 @@ import argparse import random import time -from builtins import range, str + +from six.moves.builtins import str from webapollo import WAAuth, WebApolloInstance diff -r b973f3f7b509 -r 99b00626720a create_features_from_gff3.py --- a/create_features_from_gff3.py Thu Feb 08 11:36:25 2018 -0500 +++ b/create_features_from_gff3.py Mon Mar 12 06:29:56 2018 -0400 @@ -3,10 +3,11 @@ import logging import sys import time -from builtins import str from BCBio import GFF +from six.moves.builtins import str + from webapollo import AssertUser, GuessOrg, OrgOrGuess, WAAuth, WebApolloInstance, featuresToFeatureSchema, retry logging.basicConfig(level=logging.INFO) log = logging.getLogger(__name__) diff -r b973f3f7b509 -r 99b00626720a export.py --- a/export.py Thu Feb 08 11:36:25 2018 -0500 +++ b/export.py Mon Mar 12 06:29:56 2018 -0400 @@ -9,11 +9,8 @@ from Bio import SeqIO -from future import standard_library - from webapollo import CnOrGuess, GuessCn, WAAuth, WebApolloInstance -standard_library.install_aliases() try: import StringIO as io except ImportError: diff -r b973f3f7b509 -r 99b00626720a list_organisms.xml --- a/list_organisms.xml Thu Feb 08 11:36:25 2018 -0500 +++ b/list_organisms.xml Mon Mar 12 06:29:56 2018 -0400 @@ -1,5 +1,5 @@ - + in Apollo macros.xml diff -r b973f3f7b509 -r 99b00626720a macros.xml --- a/macros.xml Thu Feb 08 11:36:25 2018 -0500 +++ b/macros.xml Mon Mar 12 06:29:56 2018 -0400 @@ -6,7 +6,7 @@ biopython bcbiogff requests - future + six diff -r b973f3f7b509 -r 99b00626720a webapollo.py --- a/webapollo.py Thu Feb 08 11:36:25 2018 -0500 +++ b/webapollo.py Mon Mar 12 06:29:56 2018 -0400 @@ -7,20 +7,18 @@ import os import time from abc import abstractmethod -from builtins import next -from builtins import object -from builtins import str from BCBio import GFF from Bio import SeqIO -from future import standard_library - import requests +from six.moves.builtins import next +from six.moves.builtins import object +from six.moves.builtins import str -standard_library.install_aliases() + try: import StringIO as io except BaseException: