Repository 'apollo_export'
hg clone https://toolshed.g2.bx.psu.edu/repos/gga/apollo_export

Changeset 4:5559e41721c3 (2018-03-12)
Previous changeset 3:236155b4e5f9 (2017-09-20) Next changeset 5:950fb2bf116d (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
export.xml
macros.xml
webapollo.py
b
diff -r 236155b4e5f9 -r 5559e41721c3 README.rst
--- a/README.rst Wed Sep 20 09:43:36 2017 -0400
+++ b/README.rst Mon Mar 12 06:31:27 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 236155b4e5f9 -r 5559e41721c3 create_account.py
--- a/create_account.py Wed Sep 20 09:43:36 2017 -0400
+++ b/create_account.py Mon Mar 12 06:31:27 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 236155b4e5f9 -r 5559e41721c3 create_features_from_gff3.py
--- a/create_features_from_gff3.py Wed Sep 20 09:43:36 2017 -0400
+++ b/create_features_from_gff3.py Mon Mar 12 06:31:27 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 236155b4e5f9 -r 5559e41721c3 export.py
--- a/export.py Wed Sep 20 09:43:36 2017 -0400
+++ b/export.py Mon Mar 12 06:31:27 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 236155b4e5f9 -r 5559e41721c3 export.xml
--- a/export.xml Wed Sep 20 09:43:36 2017 -0400
+++ b/export.xml Mon Mar 12 06:31:27 2018 -0400
b
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tool id="export" name="Retrieve Data" version="3.0">
+<tool id="export" name="Retrieve Data" version="3.1">
   <description>from Apollo into Galaxy</description>
   <macros>
     <import>macros.xml</import>
b
diff -r 236155b4e5f9 -r 5559e41721c3 macros.xml
--- a/macros.xml Wed Sep 20 09:43:36 2017 -0400
+++ b/macros.xml Mon Mar 12 06:31:27 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 236155b4e5f9 -r 5559e41721c3 webapollo.py
--- a/webapollo.py Wed Sep 20 09:43:36 2017 -0400
+++ b/webapollo.py Mon Mar 12 06:31:27 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: