Skip to content

Google Bucket Address Update #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zheng-broad wants to merge 3 commits into
base: organization_updates
Choose a base branch
from
Open

Google Bucket Address Update #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a745fd4
update Google Cloud bucket addresses
zheng-broad Jan 15, 2021
8017f93
Merge pull request #1 from zheng-broad/master
zheng-broad Jan 19, 2021
9fe53f5
Update merlin.py
zheng-broad Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion merlin/merlin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ def _clean_string_arg(stringIn):
def _get_input_path(prompt):
while True:
pathString = str(input(prompt))
if not pathString.startswith('s3://') \
if not (pathString.startswith('s3://') or pathString.startswith('gs://')\
or pathString.startswith('gc://')) \
and not os.path.exists(os.path.expanduser(pathString)):
print('Directory %s does not exist. Please enter a valid path.'
% pathString)
Expand Down
2 changes: 1 addition & 1 deletion merlin/util/dataportal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def create_portal(basePath: str) -> 'DataPortal':
"""
if basePath.startswith('s3://'):
return S3DataPortal(basePath)
elif basePath.startswith('gc://'):
elif basePath.startswith('gs://') or basePath.startswith('gc://'):
return GCloudDataPortal(basePath)
else:
return LocalDataPortal(basePath)
Expand Down