Skip to content
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

Jump to bottom

Fixing ExecutorLog/TaskLog mixup #29

Merged
merged 4 commits into from
Jul 9, 2020
Merged

Fixing ExecutorLog/TaskLog mixup #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11692d7
Changing order of deserialize attempt order to stop exception happening
kellrott Apr 6, 2020
0d6f896
Merge branch 'master' into log-bug
kellrott Jul 9, 2020
7e19109
Fixing small error in formatting
kellrott Jul 9, 2020
8a33791
Fixing coverage test
kellrott Jul 9, 2020
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
2 changes: 1 addition & 1 deletion .coverage
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tes/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def __check_url(self, attribute, value):
if u.scheme not in ["http", "https"]:
raise ValueError(
"Unsupported URL scheme - must be one of [%s,%s]"
% (["http", "https"])
% ("http", "https")
)

def get_service_info(self):
Expand Down
2 changes: 1 addition & 1 deletion tes/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def unmarshal(j, o, convert_camel_case=True):
"tasks": Task,
"inputs": Input,
"outputs": (Output, OutputFileLog),
"logs": (TaskLog, ExecutorLog),
"logs": (ExecutorLog, TaskLog),
"resources": Resources,
"executors": Executor
}
Expand Down
2 changes: 1 addition & 1 deletion tests/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
coverage>=4.4.1
coverage==4.5.4
coveralls>=1.1
flake8>=3.3.0
nose>=1.3.7
Expand Down