Skip to content

Commit 0cb8dbb

Browse files
authored
v0.16.35 (#181)
Hotfix: mop was failing for Python 2.7 installations when the user didn't set a default project, and the bucket listing error message was broken. To fix this, bucket listing was updated to use the workspace billing project, and the bucket listing exception catching code was corrected.
1 parent 95e03f1 commit 0cb8dbb

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

changelog.txt

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
=======================================================================
1+
================================================================================
22
Change Log for FISSFC: the (Fi)recloud (S)ervice (S)elector
3-
=======================================================================
3+
================================================================================
44
Terms used below: HL = high level interface, LL = low level interface
55

6+
v0.16.35 - Hotfix: mop returned errors in Python 2 when trying to read the
7+
workspace bucket - bucket listing updated to use the workspace
8+
billing project, and the error report was cleaned up.
9+
610
v0.16.34 - Hotfixes: in Python 2 map() returns a list, in Python 3, map()
711
returns a generator object - tasks that returned map(f(x),iterable)
812
now return a list comprehension; clock-skew now checks for argument

firecloud/__about__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Package version
2-
__version__ = "0.16.34"
2+
__version__ = "0.16.35"

firecloud/fiss.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1343,7 +1343,7 @@ def list_blob_gen(bucket_name):
13431343
Yields:
13441344
tuple: File name and the size of the file
13451345
"""
1346-
client_st = storage.Client()
1346+
client_st = storage.Client(project=args.project)
13471347
blobs = client_st.list_blobs(bucket_name)
13481348
for blob in blobs:
13491349
yield ("gs://{}/{}".format(blob.bucket.name, blob.name), int(blob.size))
@@ -1388,7 +1388,7 @@ def list_blob_gen(bucket_name):
13881388

13891389
except Exception as e:
13901390
eprint("Error retrieving files from bucket:" +
1391-
"\n\t{}\n\t{}".format(str(e), e.output))
1391+
"\n\t{}: {}".format(type(e).__name__, e))
13921392
return 1
13931393

13941394
if args.verbose:

0 commit comments

Comments
 (0)