| Previous changeset 3:951ef9b7bafc (2017-09-20) Next changeset 5:207c1c281360 (2018-08-31) |
|
Commit message:
planemo upload for repository https://github.com/galaxy-genome-annotation/galaxy-tools/tree/master/tools/apollo commit 70fbb41d4c6b0a08a7bed4849a5ae7c865e1ab1e |
|
modified:
README.rst create_account.py create_features_from_gff3.py export.py json2iframe.xml macros.xml webapollo.py |
| b |
| diff -r 951ef9b7bafc -r a10003dc6c85 README.rst --- a/README.rst Wed Sep 20 09:44:39 2017 -0400 +++ b/README.rst Mon Mar 12 06:31:48 2018 -0400 |
| b |
| @@ -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 |
| b |
| diff -r 951ef9b7bafc -r a10003dc6c85 create_account.py --- a/create_account.py Wed Sep 20 09:44:39 2017 -0400 +++ b/create_account.py Mon Mar 12 06:31:48 2018 -0400 |
| b |
| @@ -5,7 +5,7 @@ import random import time -from builtins import range, str +from six.moves.builtins import str from webapollo import WAAuth, WebApolloInstance |
| b |
| diff -r 951ef9b7bafc -r a10003dc6c85 create_features_from_gff3.py --- a/create_features_from_gff3.py Wed Sep 20 09:44:39 2017 -0400 +++ b/create_features_from_gff3.py Mon Mar 12 06:31:48 2018 -0400 |
| b |
| @@ -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) |
| b |
| diff -r 951ef9b7bafc -r a10003dc6c85 export.py --- a/export.py Wed Sep 20 09:44:39 2017 -0400 +++ b/export.py Mon Mar 12 06:31:48 2018 -0400 |
| b |
| @@ -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: |
| b |
| diff -r 951ef9b7bafc -r a10003dc6c85 json2iframe.xml --- a/json2iframe.xml Wed Sep 20 09:44:39 2017 -0400 +++ b/json2iframe.xml Mon Mar 12 06:31:48 2018 -0400 |
| b |
| @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tool id="iframe" name="Annotate" version="3.0"> +<tool id="iframe" name="Annotate" version="3.1"> <description>opens an IFrame to Apollo</description> <macros> <import>macros.xml</import> |
| b |
| diff -r 951ef9b7bafc -r a10003dc6c85 macros.xml --- a/macros.xml Wed Sep 20 09:44:39 2017 -0400 +++ b/macros.xml Mon Mar 12 06:31:48 2018 -0400 |
| b |
| @@ -6,7 +6,7 @@ <requirement type="package" version="1.65">biopython</requirement> <requirement type="package" version="0.6.2">bcbiogff</requirement> <requirement type="package" version="2.12.4">requests</requirement> - <requirement type="package" version="0.16.0">future</requirement> + <requirement type="package" version="1.11.0">six</requirement> <yield/> </requirements> </xml> |
| b |
| diff -r 951ef9b7bafc -r a10003dc6c85 webapollo.py --- a/webapollo.py Wed Sep 20 09:44:39 2017 -0400 +++ b/webapollo.py Mon Mar 12 06:31:48 2018 -0400 |
| b |
| @@ -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: |