Upgraded genomespaceclient to newer version

This fixes issue reported in: galaxyproject/usegalaxy-playbook#100 Also related to PR: #6660
galaxyproject · Sep 4, 2018 · c867c68 · c867c68
1 parent bc1526a
commit c867c68
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/galaxy/dependencies/pipfiles/default/Pipfile b/lib/galaxy/dependencies/pipfiles/default/Pipfile
@@ -69,7 +69,7 @@ svgwrite = "*"
 pyparsing = "*"
 "Fabric3" = "*"
 paramiko = "*"
-python-genomespaceclient = "<1.0"
+python-genomespaceclient = "<2.0"
 social_auth_core = {version = "==1.5.0", extras = ['openidconnect']}
 
 [requires]

diff --git a/lib/galaxy/dependencies/pipfiles/default/pinned-requirements.txt b/lib/galaxy/dependencies/pipfiles/default/pinned-requirements.txt
@@ -93,7 +93,7 @@ pyperclip==1.6.4
 pysam==0.14.1
 python-cinderclient==2.0.1
 python-dateutil==2.7.3
-python-genomespaceclient==0.2
+python-genomespaceclient==1.0.0
 python-glanceclient==2.6.0; python_version != '3.3.*'
 python-keystoneclient==3.10.0; python_version != '3.3.*'
 python-lzo==1.12

diff --git a/tools/genomespace/genomespace_importer.py b/tools/genomespace/genomespace_importer.py
@@ -148,7 +148,7 @@ def determine_file_type(input_url, output_filename, metadata, json_params, sniff
     Determine the Galaxy data format for this file.
     """
     # Use genomespace metadata to map type
-    file_format = metadata.dataFormat.name if metadata.dataFormat else None
+    file_format = metadata.data_format.name if metadata.data_format else None
     file_type = get_galaxy_ext_from_genomespace_format(file_format)
 
     # If genomespace metadata has no identifiable format, attempt to sniff type