updating mimetype

Signed-off-by: Vanessa Sochat <[email protected]>

Author: vsoch

singularity/build/google/instances.py

@@ -235,15 +235,18 @@ def get_build_metadata(key):
 
 
 def get_build_params(metadata):
-    '''get_build_params uses get_build_metadata to retrieve corresponding meta data values for a build
-    :param metadata: a list, each item a dictionary of metadata, in format:
-    metadata = [{'key': 'repo_url', 'value': repo_url },
-                {'key': 'repo_id', 'value': repo_id },
-                {'key': 'credential', 'value': credential },
-                {'key': 'response_url', 'value': response_url },
-                {'key': 'token', 'value': token},
-                {'key': 'commit', 'value': commit }]
+    '''get_build_params uses get_build_metadata to retrieve corresponding 
+       meta data values for a build
 
+       Parameters
+       ==========
+       metadata: a list, each item a dictionary of metadata, in format:
+       metadata = [{'key': 'repo_url', 'value': repo_url },
+                   {'key': 'repo_id', 'value': repo_id },
+                   {'key': 'credential', 'value': credential },
+                   {'key': 'response_url', 'value': response_url },
+                   {'key': 'token', 'value': token},
+                   {'key': 'commit', 'value': commit }]
     '''
     params = dict()
     for item in metadata:

singularity/build/google/storage.py

@@ -61,19 +61,23 @@ def delete_object(storage_service, bucket_name, object_name):
 @retry(wait_exponential_multiplier=1000, wait_exponential_max=10000)
 def upload_file(storage_service,bucket,bucket_path,file_name,verbose=True):
     '''get_folder will return the folder with folder_name, and if create=True,
-    will create it if not found. If folder is found or created, the metadata is
-    returned, otherwise None is returned
-    :param storage_service: the drive_service created from get_storage_service
-    :param bucket: the bucket object from get_bucket
-    :param file_name: the name of the file to upload
-    :param bucket_path: the path to upload to
+       will create it if not found. If folder is found or created, the metadata is
+       returned, otherwise None is returned
+
+       Parameters
+       ==========
+       storage_service: the drive_service created from get_storage_service
+       bucket: the bucket object from get_bucket
+       file_name: the name of the file to upload
+       bucket_path: the path to upload to
     '''
     # Set up path on bucket
     upload_path = "%s/%s" %(bucket['id'],bucket_path)
     if upload_path[-1] != '/':
         upload_path = "%s/" %(upload_path)
     upload_path = "%s%s" %(upload_path,os.path.basename(file_name))
-    body = {'name': upload_path }
+    body = {'name': upload_path}
+
     # Create media object with correct mimetype
     if os.path.exists(file_name):
         mimetype = sniff_extension(file_name,verbose=verbose)

singularity/build/google/utils.py

@@ -29,10 +29,12 @@
 ################################################################################
 
 def get_google_service(service_type=None, version=None):
-    '''
-    get a google service using the discovery client.
-    :param service_type: the service to get (default is storage)
-    :param version: version to use (default is v1)
+    '''get a google service using the discovery client.
+
+       Parameters
+       ==========
+       service_type: the service to get (default is storage)
+       version: version to use (default is v1)
     '''
     if service_type == None:
         service_type = "storage"

singularity/build/scripts/singularity-prepare-instance.sh

@@ -37,11 +37,11 @@ sudo apt-get -y install git \
                    python3-pip
 
 # Pip3 installs
-sudo -H pip3 install --upgrade pip
-sudo -H pip3 install pyasn1-modules -U
-sudo -H pip3 install --upgrade google-api-python-client
-sudo -H pip3 install --upgrade google
-sudo -H pip3 install oauth2client==3.0.0
+sudo -H python3 -m pip install --upgrade pip
+sudo -H python3 -m pip install pyasn1-modules -U
+sudo -H python3 -m pip install --upgrade google-api-python-client
+sudo -H python3 -m pip install --upgrade google
+sudo -H python3 -m pip install oauth2client==3.0.0
 
 # Install GoLang
 export VERSION=1.12.6 OS=linux ARCH=amd64

singularity/build/utils.py

@@ -182,6 +182,7 @@ def sniff_extension(file_path,verbose=True):
                       "mp3": 'audio/mpeg',
                       "zip": 'application/zip',
                       "simg": 'application/zip',
+                      "sif": 'application/zip',
                       "rar": 'application/rar',
                       "tar": 'application/tar',
                       "arj": 'application/arj',