# HG changeset patch # User gga # Date 1520850776 14400 # Node ID b69804a685e2d6bbe9b3fce0cd59a882c145d619 # Parent aaf308a498998653c894c63f98abfd5937ca5498 planemo upload for repository https://github.com/galaxy-genome-annotation/galaxy-tools/tree/master/tools/apollo commit 70fbb41d4c6b0a08a7bed4849a5ae7c865e1ab1e diff -r aaf308a49899 -r b69804a685e2 README.rst --- a/README.rst Wed Sep 20 09:44:54 2017 -0400 +++ b/README.rst Mon Mar 12 06:32: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 aaf308a49899 -r b69804a685e2 create_account.py --- a/create_account.py Wed Sep 20 09:44:54 2017 -0400 +++ b/create_account.py Mon Mar 12 06:32:56 2018 -0400 @@ -5,7 +5,7 @@ import random import time -from builtins import range, str +from six.moves.builtins import str from webapollo import WAAuth, WebApolloInstance diff -r aaf308a49899 -r b69804a685e2 create_features_from_gff3.py --- a/create_features_from_gff3.py Wed Sep 20 09:44:54 2017 -0400 +++ b/create_features_from_gff3.py Mon Mar 12 06:32:56 2018 -0400 @@ -4,9 +4,9 @@ import sys import time -from builtins import str +from BCBio import GFF -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) diff -r aaf308a49899 -r b69804a685e2 export.py --- a/export.py Wed Sep 20 09:44:54 2017 -0400 +++ b/export.py Mon Mar 12 06:32: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 aaf308a49899 -r b69804a685e2 list_organisms.xml --- a/list_organisms.xml Wed Sep 20 09:44:54 2017 -0400 +++ b/list_organisms.xml Mon Mar 12 06:32:56 2018 -0400 @@ -1,5 +1,5 @@ - + in Apollo macros.xml diff -r aaf308a49899 -r b69804a685e2 macros.xml --- a/macros.xml Wed Sep 20 09:44:54 2017 -0400 +++ b/macros.xml Mon Mar 12 06:32:56 2018 -0400 @@ -6,7 +6,7 @@ biopython bcbiogff requests - future + six diff -r aaf308a49899 -r b69804a685e2 webapollo.py --- a/webapollo.py Wed Sep 20 09:44:54 2017 -0400 +++ b/webapollo.py Mon Mar 12 06:32:56 2018 -0400 @@ -6,22 +6,19 @@ import logging 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: