Import gxformat2 as an external dependency.

galaxyproject · Oct 6, 2018 · 18b4274 · 18b4274
1 parent 10e984c
commit 18b4274
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 700 deletions.
diff --git a/lib/galaxy/dependencies/pipfiles/default/Pipfile b/lib/galaxy/dependencies/pipfiles/default/Pipfile
@@ -73,6 +73,7 @@ paramiko = "*"
 python-genomespaceclient = "<2.0"
 social_auth_core = {version = "==1.5.0", extras = ['openidconnect']}
 cloudauthz = "<=0.2.0"
+gxformat2 = "*"
 
 [requires]
 python_version = "2.7"
diff --git a/lib/galaxy/dependencies/pipfiles/default/pinned-requirements.txt b/lib/galaxy/dependencies/pipfiles/default/pinned-requirements.txt
@@ -55,6 +55,7 @@ functools32==3.2.3.post2; python_version == '2.7'
 future==0.16.0
 futures==3.2.0; python_version == '2.6' or python_version == '2.7'
 galaxy-sequence-utils==1.1.3
+gxformat2==0.3.0
 h5py==2.8.0
 html5lib==1.0.1
 idna==2.7

diff --git a/test/base/populators.py b/test/base/populators.py
@@ -16,16 +16,16 @@ def nottest(x):
         return x
 import requests
 import yaml
+from gxformat2 import (
+    convert_and_import_workflow,
+    ImporterGalaxyInterface,
+)
 from pkg_resources import resource_string
 from six import StringIO
 
 from galaxy.tools.verify.test_data import TestDataResolver
 from galaxy.util import unicodify
 from . import api_asserts
-from .workflows_format_2 import (
-    convert_and_import_workflow,
-    ImporterGalaxyInterface,
-)
 
 
 # Simple workflow that takes an input and call cat wrapper on it.

diff --git a/test/base/workflows_format_2/README.txt b/test/base/workflows_format_2/README.txt
diff --git a/test/base/workflows_format_2/__init__.py b/test/base/workflows_format_2/__init__.py