Skip to content

Commit 3f1ed26

Browse files
DailyDreamingdavid4096
authored andcommitted
Pass flake8. (#23)
* flake8 ignore line length. * Pass flake8. * Newline in .flake8
1 parent f3b541e commit 3f1ed26

File tree

8 files changed

+45
-46
lines changed

8 files changed

+45
-46
lines changed

.flake8

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[flake8]
2+
max-line-length = 888

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ coverage.xml
5252
*.mo
5353
*.pot
5454

55+
# PyCharm
56+
.idea/
57+
5558
# Django stuff:
5659
*.log
5760
local_settings.py

cwl_flask.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
from flask import Flask, Response, request, redirect
2-
import os
32
import subprocess
43
import tempfile
54
import json
65
import yaml
7-
import urlparse
86
import signal
97
import threading
108
import time
@@ -15,6 +13,7 @@
1513
jobs_lock = threading.Lock()
1614
jobs = []
1715

16+
1817
class Job(threading.Thread):
1918
def __init__(self, jobid, path, inputobj):
2019
super(Job, self).__init__()
@@ -117,16 +116,19 @@ def logspooler(job):
117116
break
118117
time.sleep(1)
119118

119+
120120
@app.route("/jobs/<int:jobid>/log", methods=['GET'])
121121
def getlog(jobid):
122122
with jobs_lock:
123123
job = jobs[jobid]
124124
return Response(logspooler(job))
125125

126+
126127
@app.route("/jobs", methods=['GET'])
127128
def getjobs():
128129
with jobs_lock:
129130
jobscopy = copy.copy(jobs)
131+
130132
def spool(jc):
131133
yield "["
132134
first = True
@@ -135,10 +137,11 @@ def spool(jc):
135137
yield json.dumps(j.getstatus(), indent=4)
136138
first = False
137139
else:
138-
yield ", " + json.dumps(j.getstatus(), indent=4)
140+
yield ", " + json.dumps(j.getstatus(), indent=4)
139141
yield "]"
140142
return Response(spool(jobscopy))
141143

144+
142145
if __name__ == "__main__":
143-
#app.debug = True
146+
# app.debug = True
144147
app.run()

cwltool_stream.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
_logger = logging.getLogger("cwltool")
1111
_logger.setLevel(logging.ERROR)
1212

13+
1314
def main(args=None):
1415
if args is None:
1516
args = sys.argv[1:]
1617

1718
if len(args) == 0:
18-
print "Workflow must be on command line"
19+
print("Workflow must be on command line")
1920
return 1
2021

2122
parser = cwltool.main.arg_parser()
@@ -38,5 +39,6 @@ def main(args=None):
3839
sys.stdout.write("\n\n")
3940
sys.stdout.flush()
4041

42+
4143
if __name__ == "__main__":
4244
sys.exit(main(sys.argv[1:]))

setup.py

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
#!/usr/bin/env python
22

33
import os
4-
import sys
5-
import setuptools.command.egg_info as egg_info_cmd
6-
import shutil
7-
8-
from setuptools import setup, find_packages
4+
from setuptools import setup
95

106
SETUP_DIR = os.path.dirname(__file__)
117

@@ -32,15 +28,13 @@
3228
'ruamel.yaml >= 0.12.4, < 0.15',
3329
'cwlref-runner',
3430
'schema-salad'
35-
],
31+
],
3632
entry_points={
37-
'console_scripts': [ "wes-server=wes_service:main",
38-
"wes-client=wes_client:main"]
39-
},
33+
'console_scripts': ["wes-server=wes_service:main",
34+
"wes-client=wes_client:main"]
35+
},
4036
extras_require={
41-
"arvados": [
42-
"arvados-cwl-runner"
43-
]
44-
},
37+
"arvados": ["arvados-cwl-runner"
38+
]},
4539
zip_safe=False
46-
)
40+
)

wes_client/__init__.py

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
#!/usr/bin/env python
2-
3-
from bravado.client import SwaggerClient
4-
from bravado.requests_client import RequestsClient
2+
import urlparse
3+
import pkg_resources # part of setuptools
4+
import urllib
55
import json
66
import time
77
import sys
88
import os
99
import argparse
1010
import logging
11-
import urlparse
12-
import pkg_resources # part of setuptools
13-
from wes_service.util import visit
14-
import urllib
15-
import ruamel.yaml as yaml
1611
import schema_salad.ref_resolver
12+
from wes_service.util import visit
13+
from bravado.client import SwaggerClient
14+
from bravado.requests_client import RequestsClient
15+
1716

1817
def main(argv=sys.argv[1:]):
1918
parser = argparse.ArgumentParser(description='Workflow Execution Service')
20-
parser.add_argument(
21-
"--host", type=str, default=os.environ.get("WES_API_HOST"))
22-
parser.add_argument(
23-
"--auth", type=str, default=os.environ.get("WES_API_AUTH"))
24-
parser.add_argument(
25-
"--proto", type=str, default=os.environ.get("WES_API_PROTO", "https"))
19+
parser.add_argument("--host", type=str, default=os.environ.get("WES_API_HOST"))
20+
parser.add_argument("--auth", type=str, default=os.environ.get("WES_API_AUTH"))
21+
parser.add_argument("--proto", type=str, default=os.environ.get("WES_API_PROTO", "https"))
2622
parser.add_argument("--quiet", action="store_true", default=False)
2723
parser.add_argument("--outdir", type=str)
2824

@@ -35,18 +31,16 @@ def main(argv=sys.argv[1:]):
3531
exgroup.add_argument("--version", action="store_true", default=False)
3632

3733
exgroup = parser.add_mutually_exclusive_group()
38-
exgroup.add_argument(
39-
"--wait", action="store_true", default=True, dest="wait")
40-
exgroup.add_argument(
41-
"--no-wait", action="store_false", default=True, dest="wait")
34+
exgroup.add_argument("--wait", action="store_true", default=True, dest="wait")
35+
exgroup.add_argument("--no-wait", action="store_false", default=True, dest="wait")
4236

4337
parser.add_argument("workflow_url", type=str, nargs="?", default=None)
4438
parser.add_argument("job_order", type=str, nargs="?", default=None)
4539
args = parser.parse_args(argv)
4640

4741
if args.version:
4842
pkg = pkg_resources.require("wes_service")
49-
print u"%s %s" % (sys.argv[0], pkg[0].version)
43+
print(u"%s %s" % (sys.argv[0], pkg[0].version))
5044
exit(0)
5145

5246
http_client = RequestsClient()

wes_service/__init__.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1+
#!/usr/bin/env python
12
import argparse
23
import sys
34
import ruamel.yaml
45
import os
56
import logging
6-
7-
logging.basicConfig(level=logging.INFO)
8-
97
import connexion
108
import connexion.utils as utils
119
from connexion.resolver import Resolver
1210

11+
logging.basicConfig(level=logging.INFO)
12+
13+
1314
def setup(args=None):
1415
if args is None:
1516
args = argparse.Namespace()
@@ -22,14 +23,12 @@ def setup(args=None):
2223
for c in config:
2324
setattr(args, c, config[c])
2425

25-
2626
logging.info("Using config:")
2727
for n in args.__dict__:
2828
logging.info(" %s: %s", n, getattr(args, n))
2929

3030
app = connexion.App(__name__)
31-
backend = utils.get_function_from_name(
32-
args.backend + ".create_backend")(args.opt)
31+
backend = utils.get_function_from_name(args.backend + ".create_backend")(args.opt)
3332

3433
def rs(x):
3534
return getattr(backend, x)
@@ -43,8 +42,7 @@ def rs(x):
4342

4443
def main(argv=sys.argv[1:]):
4544
parser = argparse.ArgumentParser(description='Workflow Execution Service')
46-
parser.add_argument(
47-
"--backend", type=str, default="wes_service.cwl_runner")
45+
parser.add_argument("--backend", type=str, default="wes_service.cwl_runner")
4846
parser.add_argument("--port", type=int, default=8080)
4947
parser.add_argument("--opt", type=str, action="append")
5048
parser.add_argument("--debug", action="store_true", default=False)

wes_service/arvados_wes.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@
1313

1414
from wes_service.util import visit, WESBackend
1515

16+
1617
class MissingAuthorization(Exception):
1718
pass
1819

20+
1921
def get_api():
2022
if not connexion.request.headers.get('Authorization'):
2123
raise MissingAuthorization()
@@ -52,6 +54,7 @@ def catch_exceptions_wrapper(self, *args, **kwargs):
5254

5355
return catch_exceptions_wrapper
5456

57+
5558
class ArvadosBackend(WESBackend):
5659
def GetServiceInfo(self):
5760
return {

0 commit comments

Comments
 (0)