Skip to content

Commit 9526e06

Browse files
committed
adding function to delete files from storage
1 parent 736b6d2 commit 9526e06

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
name="singularity",
88

99
# Version number:
10-
version="0.83",
10+
version="0.86",
1111

1212
# Application author details:
1313
author="Vanessa Sochat",

singularity/analysis/compare.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ def container_similarity_vector(container1=None,packages_set=None,by=None,custom
6262
for b in by:
6363
bot.logger.debug("Starting comparisons for %s",b)
6464
df = pandas.DataFrame(columns=packages_set)
65-
for package1 in packages_set:
65+
for package2 in packages_set:
6666
sim = calculate_similarity(container1=container1,
67-
image_package2=package1,
67+
image_package2=package2,
6868
by=b)[b]
6969

70-
name1 = os.path.basename(package1).replace('.img.zip','')
70+
name1 = os.path.basename(package2).replace('.img.zip','')
7171
bot.logger.debug("container vs. %s: %s" %(name1,sim))
7272
df.loc["container",package2] = sim
7373
df.columns = [os.path.basename(x).replace('.img.zip','') for x in df.columns.tolist()]

singularity/build/google.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,16 @@ def get_bucket(storage_service,bucket_name):
6565
return req.execute()
6666

6767

68+
def delete_object(storage_service,bucket_name,object_name):
69+
'''delete_file will delete a file from a bucket
70+
:param storage_service: the service obtained with get_storage_service
71+
:param bucket_name: the name of the bucket (eg singularity-hub)
72+
:param object_name: the "name" parameter of the object.
73+
'''
74+
return storage_service.objects().delete(bucket=bucket_name,
75+
object=object_name).execute()
76+
77+
6878
def upload_file(storage_service,bucket,bucket_path,file_name,verbose=True):
6979
'''get_folder will return the folder with folder_name, and if create=True,
7080
will create it if not found. If folder is found or created, the metadata is

0 commit comments

Comments
 (0)