Skip to content

Commit 2e1faf3

Browse files
committed
updating build to include build files
1 parent ebdb5ff commit 2e1faf3

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
recursive-include singularity/templates *
22
recursive-include singularity/static *
3-
recursive-include singularity/scripts *
3+
recursive-include singularity/build *
44
recursive-include singularity/testing *

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
# Data files
2020
include_package_data=True,
21-
2221
zip_safe=False,
2322

2423
# Details

singularity/build/google.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,13 @@
5959
def get_storage_service():
6060
credentials = GoogleCredentials.get_application_default()
6161
return build('storage', 'v1', credentials=credentials)
62+
63+
64+
def get_compute_service():
65+
credentials = GoogleCredentials.get_application_default()
66+
return build('compute', 'v1', credentials=credentials)
6267

68+
6369
def get_bucket(storage_service,bucket_name):
6470
req = storage_service.buckets().get(bucket=bucket_name)
6571
return req.execute()

singularity/utils.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,14 @@
3939
######################################################################################
4040

4141

42-
def check_install(software="singularity"):
42+
def check_install(software=None):
4343
'''check_install will attempt to run the singularity command, and return an error
4444
if not installed. The command line utils will not run without this check.
4545
'''
46-
46+
if software == None:
47+
software = "singularity"
4748
cmd = [software,'--version']
48-
version = run_command(cmd,error_message="Cannot find singularity. Is it installed?")
49+
version = run_command(cmd,error_message="Cannot find %s. Is it installed?" %software)
4950
if version != None:
5051
bot.logger.info("Found %s version %s",software.upper(),version)
5152
return True

0 commit comments

Comments
 (0)