firecloud 0.16.39__tar.gz → 0.16.41__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {firecloud-0.16.39 → firecloud-0.16.41}/PKG-INFO +24 -2
- firecloud-0.16.41/firecloud/__about__.py +2 -0
- {firecloud-0.16.39 → firecloud-0.16.41}/firecloud/__init__.py +0 -0
- {firecloud-0.16.39 → firecloud-0.16.41}/firecloud/api.py +7 -1
- {firecloud-0.16.39 → firecloud-0.16.41}/firecloud/config.py +0 -0
- {firecloud-0.16.39 → firecloud-0.16.41}/firecloud/entity.py +0 -0
- {firecloud-0.16.39 → firecloud-0.16.41}/firecloud/errors.py +0 -0
- {firecloud-0.16.39 → firecloud-0.16.41}/firecloud/fccore.py +2 -2
- {firecloud-0.16.39 → firecloud-0.16.41}/firecloud/fiss.py +6 -2
- {firecloud-0.16.39 → firecloud-0.16.41}/firecloud/method.py +0 -0
- {firecloud-0.16.39 → firecloud-0.16.41}/firecloud/submission.py +0 -0
- {firecloud-0.16.39 → firecloud-0.16.41}/firecloud/supervisor.py +0 -0
- {firecloud-0.16.39 → firecloud-0.16.41}/firecloud/workspace.py +0 -0
- {firecloud-0.16.39 → firecloud-0.16.41}/firecloud.egg-info/PKG-INFO +24 -2
- {firecloud-0.16.39 → firecloud-0.16.41}/firecloud.egg-info/requires.txt +8 -2
- {firecloud-0.16.39 → firecloud-0.16.41}/setup.py +18 -7
- firecloud-0.16.39/firecloud/__about__.py +0 -2
- {firecloud-0.16.39 → firecloud-0.16.41}/LICENSE +0 -0
- {firecloud-0.16.39 → firecloud-0.16.41}/README +0 -0
- {firecloud-0.16.39 → firecloud-0.16.41}/firecloud.egg-info/SOURCES.txt +0 -0
- {firecloud-0.16.39 → firecloud-0.16.41}/firecloud.egg-info/dependency_links.txt +0 -0
- {firecloud-0.16.39 → firecloud-0.16.41}/firecloud.egg-info/entry_points.txt +0 -0
- {firecloud-0.16.39 → firecloud-0.16.41}/firecloud.egg-info/top_level.txt +0 -0
- {firecloud-0.16.39 → firecloud-0.16.41}/setup.cfg +0 -0
|
@@ -1,18 +1,40 @@
|
|
|
1
|
-
Metadata-Version: 2.
|
|
1
|
+
Metadata-Version: 2.4
|
|
2
2
|
Name: firecloud
|
|
3
|
-
Version: 0.16.
|
|
3
|
+
Version: 0.16.41
|
|
4
4
|
Summary: Firecloud API bindings and FISS CLI
|
|
5
5
|
Home-page: https://github.com/broadinstitute/fiss
|
|
6
6
|
Author: Broad Institute CGA Genome Data Analysis Center
|
|
7
7
|
Author-email: gdac@broadinstitute.org
|
|
8
8
|
License: BSD 3-Clause License
|
|
9
9
|
Classifier: Programming Language :: Python :: 2
|
|
10
|
+
Classifier: Programming Language :: Python :: 2.7
|
|
10
11
|
Classifier: Programming Language :: Python :: 3
|
|
12
|
+
Classifier: Programming Language :: Python :: 3.14
|
|
11
13
|
Classifier: Intended Audience :: Science/Research
|
|
12
14
|
Classifier: Topic :: Scientific/Engineering :: Bio-Informatics
|
|
13
15
|
Classifier: Topic :: Scientific/Engineering :: Interface Engine/Protocol Translator
|
|
14
16
|
Description-Content-Type: text/plain
|
|
15
17
|
License-File: LICENSE
|
|
18
|
+
Requires-Dist: google-auth<2,>=1.6.3; python_version < "3"
|
|
19
|
+
Requires-Dist: google-auth!=2.1.*,!=2.2.*,!=2.3.0,!=2.3.1,>=1.6.3; python_version >= "3"
|
|
20
|
+
Requires-Dist: google-cloud-storage>=1.36.1
|
|
21
|
+
Requires-Dist: pydot
|
|
22
|
+
Requires-Dist: requests[security]
|
|
23
|
+
Requires-Dist: setuptools>=40.3.0
|
|
24
|
+
Requires-Dist: six
|
|
25
|
+
Provides-Extra: test
|
|
26
|
+
Requires-Dist: pylint>=1.9.5; extra == "test"
|
|
27
|
+
Dynamic: author
|
|
28
|
+
Dynamic: author-email
|
|
29
|
+
Dynamic: classifier
|
|
30
|
+
Dynamic: description
|
|
31
|
+
Dynamic: description-content-type
|
|
32
|
+
Dynamic: home-page
|
|
33
|
+
Dynamic: license
|
|
34
|
+
Dynamic: license-file
|
|
35
|
+
Dynamic: provides-extra
|
|
36
|
+
Dynamic: requires-dist
|
|
37
|
+
Dynamic: summary
|
|
16
38
|
|
|
17
39
|
=======================================================================
|
|
18
40
|
1. Description
|
|
File without changes
|
|
@@ -1191,7 +1191,8 @@ def create_submission(wnamespace, workspace, cnamespace, config,
|
|
|
1191
1191
|
entity=None, etype=None, expression=None,
|
|
1192
1192
|
use_callcache=True, delete_intermediate_output_files=False,
|
|
1193
1193
|
use_reference_disks=False, memory_retry_multiplier=0,
|
|
1194
|
-
workflow_failure_mode="", user_comment=""
|
|
1194
|
+
workflow_failure_mode="", user_comment="",
|
|
1195
|
+
per_workflow_cost_cap=None):
|
|
1195
1196
|
"""Submit job in FireCloud workspace.
|
|
1196
1197
|
|
|
1197
1198
|
Args:
|
|
@@ -1225,6 +1226,8 @@ def create_submission(wnamespace, workspace, cnamespace, config,
|
|
|
1225
1226
|
for more information.
|
|
1226
1227
|
user_comment: Freeform user defined description, optional (max length
|
|
1227
1228
|
1000 characters)
|
|
1229
|
+
per_workflow_cost_cap (float): A cost threshold in USD to apply to individual
|
|
1230
|
+
workflows. When the estimated cost is exceeded, the workflow is terminated.
|
|
1228
1231
|
|
|
1229
1232
|
Swagger:
|
|
1230
1233
|
https://api.firecloud.org/#!/Submissions/createSubmission
|
|
@@ -1254,6 +1257,9 @@ def create_submission(wnamespace, workspace, cnamespace, config,
|
|
|
1254
1257
|
|
|
1255
1258
|
if memory_retry_multiplier:
|
|
1256
1259
|
body['memoryRetryMultiplier'] = memory_retry_multiplier
|
|
1260
|
+
|
|
1261
|
+
if per_workflow_cost_cap:
|
|
1262
|
+
body['perWorkflowCostCap'] = per_workflow_cost_cap
|
|
1257
1263
|
|
|
1258
1264
|
if workflow_failure_mode:
|
|
1259
1265
|
body['workflowFailureMode'] = workflow_failure_mode
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -17,7 +17,6 @@ file for the SOFTWARE COPYRIGHT and WARRANTY NOTICE.
|
|
|
17
17
|
from __future__ import print_function
|
|
18
18
|
import sys
|
|
19
19
|
import os
|
|
20
|
-
import configparser
|
|
21
20
|
import tempfile
|
|
22
21
|
import shutil
|
|
23
22
|
import subprocess
|
|
@@ -25,6 +24,7 @@ from io import IOBase
|
|
|
25
24
|
from firecloud import __about__
|
|
26
25
|
from google.auth import environment_vars
|
|
27
26
|
from six import string_types
|
|
27
|
+
from six.moves import configparser
|
|
28
28
|
|
|
29
29
|
try:
|
|
30
30
|
from collections.abc import Iterable
|
|
@@ -134,7 +134,7 @@ def config_parse(files=None, config=None, config_profile=".fissconfig", **kwargs
|
|
|
134
134
|
local_config = config
|
|
135
135
|
config = __fcconfig
|
|
136
136
|
|
|
137
|
-
cfgparser = configparser.
|
|
137
|
+
cfgparser = configparser.ConfigParser()
|
|
138
138
|
|
|
139
139
|
filenames = list()
|
|
140
140
|
|
|
@@ -610,7 +610,7 @@ def config_start(args):
|
|
|
610
610
|
args.expression, cache,
|
|
611
611
|
args.delete_intermediates, args.ref_disks,
|
|
612
612
|
args.mem_retry_multiplier, args.failure_mode,
|
|
613
|
-
args.user_comment)
|
|
613
|
+
args.user_comment, args.per_workflow_cost_cap)
|
|
614
614
|
fapi._check_response_code(r, 201)
|
|
615
615
|
id = r.json()['submissionId']
|
|
616
616
|
|
|
@@ -2105,7 +2105,7 @@ __PatternsToFilter = [
|
|
|
2105
2105
|
# This provides a systematic way of turning complex FireCloud messages into
|
|
2106
2106
|
# shorter, more comprehensible feedback: each filter entry has the form
|
|
2107
2107
|
# [regex_to_match, replacement_template, match_groups_to_fill_in_template]
|
|
2108
|
-
['^(.+)SlickWorkspaceContext\(Workspace\(([^,]+),([^,]*).*$', '%s%s::%s', (1,2,3) ],
|
|
2108
|
+
[r'^(.+)SlickWorkspaceContext\(Workspace\(([^,]+),([^,]*).*$', '%s%s::%s', (1,2,3) ],
|
|
2109
2109
|
]
|
|
2110
2110
|
for i in range(len(__PatternsToFilter)):
|
|
2111
2111
|
__PatternsToFilter[i][0] = re.compile(__PatternsToFilter[i][0])
|
|
@@ -2815,6 +2815,10 @@ def main(argv=None):
|
|
|
2815
2815
|
'this amount. See Cromwell docs ' +
|
|
2816
2816
|
'(https://cromwell.readthedocs.io/en/develop/cromwell_features/RetryWithMoreMemory)' +
|
|
2817
2817
|
' for more information.')
|
|
2818
|
+
subp.add_argument('-P', '--per_workflow_cost_cap', type=float,
|
|
2819
|
+
help='A cost threshold in USD to apply to individual ' +
|
|
2820
|
+
'workflows. When the estimated cost is exceeded, the ' +
|
|
2821
|
+
'workflow is terminated.')
|
|
2818
2822
|
subp.add_argument('-f', '--failure_mode',
|
|
2819
2823
|
choices=['NoNewCalls', 'ContinueWhilePossible'],
|
|
2820
2824
|
help='What happens after a task fails. Defaults to ' +
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -1,18 +1,40 @@
|
|
|
1
|
-
Metadata-Version: 2.
|
|
1
|
+
Metadata-Version: 2.4
|
|
2
2
|
Name: firecloud
|
|
3
|
-
Version: 0.16.
|
|
3
|
+
Version: 0.16.41
|
|
4
4
|
Summary: Firecloud API bindings and FISS CLI
|
|
5
5
|
Home-page: https://github.com/broadinstitute/fiss
|
|
6
6
|
Author: Broad Institute CGA Genome Data Analysis Center
|
|
7
7
|
Author-email: gdac@broadinstitute.org
|
|
8
8
|
License: BSD 3-Clause License
|
|
9
9
|
Classifier: Programming Language :: Python :: 2
|
|
10
|
+
Classifier: Programming Language :: Python :: 2.7
|
|
10
11
|
Classifier: Programming Language :: Python :: 3
|
|
12
|
+
Classifier: Programming Language :: Python :: 3.14
|
|
11
13
|
Classifier: Intended Audience :: Science/Research
|
|
12
14
|
Classifier: Topic :: Scientific/Engineering :: Bio-Informatics
|
|
13
15
|
Classifier: Topic :: Scientific/Engineering :: Interface Engine/Protocol Translator
|
|
14
16
|
Description-Content-Type: text/plain
|
|
15
17
|
License-File: LICENSE
|
|
18
|
+
Requires-Dist: google-auth<2,>=1.6.3; python_version < "3"
|
|
19
|
+
Requires-Dist: google-auth!=2.1.*,!=2.2.*,!=2.3.0,!=2.3.1,>=1.6.3; python_version >= "3"
|
|
20
|
+
Requires-Dist: google-cloud-storage>=1.36.1
|
|
21
|
+
Requires-Dist: pydot
|
|
22
|
+
Requires-Dist: requests[security]
|
|
23
|
+
Requires-Dist: setuptools>=40.3.0
|
|
24
|
+
Requires-Dist: six
|
|
25
|
+
Provides-Extra: test
|
|
26
|
+
Requires-Dist: pylint>=1.9.5; extra == "test"
|
|
27
|
+
Dynamic: author
|
|
28
|
+
Dynamic: author-email
|
|
29
|
+
Dynamic: classifier
|
|
30
|
+
Dynamic: description
|
|
31
|
+
Dynamic: description-content-type
|
|
32
|
+
Dynamic: home-page
|
|
33
|
+
Dynamic: license
|
|
34
|
+
Dynamic: license-file
|
|
35
|
+
Dynamic: provides-extra
|
|
36
|
+
Dynamic: requires-dist
|
|
37
|
+
Dynamic: summary
|
|
16
38
|
|
|
17
39
|
=======================================================================
|
|
18
40
|
1. Description
|
|
@@ -1,8 +1,14 @@
|
|
|
1
|
-
google-auth!=2.1.*,!=2.2.*,!=2.3.0,!=2.3.1,>=1.6.3
|
|
2
1
|
google-cloud-storage>=1.36.1
|
|
3
2
|
pydot
|
|
4
3
|
requests[security]
|
|
5
4
|
setuptools>=40.3.0
|
|
6
5
|
six
|
|
7
|
-
|
|
6
|
+
|
|
7
|
+
[:python_version < "3"]
|
|
8
|
+
google-auth<2,>=1.6.3
|
|
9
|
+
|
|
10
|
+
[:python_version >= "3"]
|
|
11
|
+
google-auth!=2.1.*,!=2.2.*,!=2.3.0,!=2.3.1,>=1.6.3
|
|
12
|
+
|
|
13
|
+
[test]
|
|
8
14
|
pylint>=1.9.5
|
|
@@ -4,11 +4,16 @@ import platform
|
|
|
4
4
|
import contextlib
|
|
5
5
|
import tempfile
|
|
6
6
|
import subprocess
|
|
7
|
-
from distutils import log
|
|
8
7
|
from shutil import rmtree
|
|
8
|
+
# Import setuptools before distutils: on Python 3.12+ distutils is only
|
|
9
|
+
# available through the copy setuptools provides
|
|
9
10
|
from setuptools import setup, find_packages, Command
|
|
10
11
|
from setuptools.command.install import install
|
|
11
|
-
from
|
|
12
|
+
from distutils import log
|
|
13
|
+
try:
|
|
14
|
+
from urllib.request import urlretrieve # Python 3
|
|
15
|
+
except ImportError:
|
|
16
|
+
from urllib import urlretrieve # Python 2
|
|
12
17
|
from firecloud.__about__ import __version__
|
|
13
18
|
from firecloud import which
|
|
14
19
|
_README = os.path.join(os.path.dirname(__file__), 'README')
|
|
@@ -75,6 +80,7 @@ class InstallGcloudCommand(Command):
|
|
|
75
80
|
"https://cloud.google.com/sdk/downloads"
|
|
76
81
|
if platform.system() == "Windows":
|
|
77
82
|
with self._tmpdir() as tmpdir:
|
|
83
|
+
# Replaces PackageIndex.download logic
|
|
78
84
|
filename = self.gcloud_url.split('/')[-1]
|
|
79
85
|
gcloud_install_cmd = os.path.join(tmpdir, filename)
|
|
80
86
|
urlretrieve(self.gcloud_url, gcloud_install_cmd)
|
|
@@ -141,20 +147,25 @@ setup(
|
|
|
141
147
|
# 'fiss = firecloud.fiss:main'
|
|
142
148
|
]
|
|
143
149
|
},
|
|
144
|
-
test_suite = 'nose.collector',
|
|
145
150
|
install_requires = [
|
|
146
|
-
|
|
151
|
+
# Python 2.7: the last google-cloud-storage release supporting it
|
|
152
|
+
# (1.44) requires google-auth<2; pip's legacy resolver won't infer it
|
|
153
|
+
'google-auth>=1.6.3,<2; python_version<"3"',
|
|
154
|
+
'google-auth>=1.6.3,!=2.1.*,!=2.2.*,!=2.3.0,!=2.3.1; python_version>="3"',
|
|
147
155
|
'google-cloud-storage>=1.36.1',
|
|
148
156
|
'pydot',
|
|
149
157
|
'requests[security]',
|
|
150
158
|
'setuptools>=40.3.0',
|
|
151
|
-
'six'
|
|
152
|
-
'nose',
|
|
153
|
-
'pylint>=1.9.5'
|
|
159
|
+
'six'
|
|
154
160
|
],
|
|
161
|
+
extras_require = {
|
|
162
|
+
'test': ['pylint>=1.9.5']
|
|
163
|
+
},
|
|
155
164
|
classifiers = [
|
|
156
165
|
"Programming Language :: Python :: 2",
|
|
166
|
+
"Programming Language :: Python :: 2.7",
|
|
157
167
|
"Programming Language :: Python :: 3",
|
|
168
|
+
"Programming Language :: Python :: 3.14",
|
|
158
169
|
"Intended Audience :: Science/Research",
|
|
159
170
|
"Topic :: Scientific/Engineering :: Bio-Informatics",
|
|
160
171
|
"Topic :: Scientific/Engineering :: Interface Engine/Protocol Translator"
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|