Skip to content

Commit

Permalink
chore(python3): migrate to python3.
Browse files Browse the repository at this point in the history
  • Loading branch information
teleyinex committed Dec 28, 2019
1 parent 358424d commit 2431157
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
name='enki',
version='3.0.0',
packages=find_packages(),
install_requires=['pybossa-client>=3.0.0, <3.0.1', 'pandas'],
install_requires=['pybossa-client>=3.0.0, <3.1.0', 'pandas'],
# metadata for upload to PyPI
author='Scifabric LTD',
author_email='info@scifabric.com',
Expand Down
2 changes: 1 addition & 1 deletion tests/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,5 +107,5 @@ def create_error_output(self, action, status_code, target,
return error

def check_error_output(self, res, err):
for k in err.keys():
for k in list(err.keys()):
assert err[k] == res[k], err
16 changes: 8 additions & 8 deletions tests/test_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def test_explode_info_without_info_dict(self, Mock):
e.get_tasks()
result = e.explode_info(e.tasks[0])
err_msg = "This item should not be exploded"
assert result.keys() == self.task.keys(), err_msg
assert list(result.keys()) == list(self.task.keys()), err_msg

@patch('pbclient.requests.get')
def test_explode_info_without_info_dict_file(self, Mock):
Expand All @@ -78,7 +78,7 @@ def test_explode_info_without_info_dict_file(self, Mock):
e.get_tasks(json_file='tests/task_no_dict.json')
result = e.explode_info(e.tasks[0])
err_msg = "This item should not be exploded"
assert 'new_key' not in result.keys(), err_msg
assert 'new_key' not in list(result.keys()), err_msg

@patch('pbclient.requests.get')
def test_explode_info_with_info_dict(self, Mock):
Expand All @@ -91,9 +91,9 @@ def test_explode_info_with_info_dict(self, Mock):
e.get_tasks()
result = e.explode_info(e.tasks[0])
err_msg = "This item should be exploded"
assert 'key' in result.keys(), err_msg
assert 'key' in list(result.keys()), err_msg
err_msg = "This item should be escaped"
assert '_id' in result.keys(), err_msg
assert '_id' in list(result.keys()), err_msg

@patch('pbclient.requests.get')
def test_explode_info_with_info_dict_file(self, Mock):
Expand All @@ -104,9 +104,9 @@ def test_explode_info_with_info_dict_file(self, Mock):
e.get_tasks(json_file='tests/task.json')
result = e.explode_info(e.tasks[0])
err_msg = "This item should be exploded"
assert 'key' in result.keys(), err_msg
assert 'key' in list(result.keys()), err_msg
err_msg = "This item should be escaped"
assert '_id' in result.keys(), err_msg
assert '_id' in list(result.keys()), err_msg

@raises(ProjectError)
@patch('pbclient.requests.get')
Expand Down Expand Up @@ -319,12 +319,12 @@ def test_get_task_runs_when_some_tasks_have_no_taskruns(self, Mock):
Mock.side_effect = [self.create_fake_request([self.task, self.ongoing_task], 200),
self.create_fake_request([], 200)]
e.get_tasks()
print e.tasks
print(e.tasks)
Mock.side_effect = [self.create_fake_request([self.taskrun], 200),
self.create_fake_request([], 200),
self.create_fake_request([], 200)]
e.get_task_runs()

assert len(e.task_runs[self.task['id']]) is 1
print self.ongoing_task
print(self.ongoing_task)
assert e.task_runs[self.ongoing_task['id']] == []
2 changes: 1 addition & 1 deletion tests/test_loaders.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,6 @@ def assert_all_tasks_belong_to_project(tasks, project_id):
assert task.project_id == project_id

def assert_task_runs_grouped_by_task(task_runs):
for task in task_runs.keys():
for task in list(task_runs.keys()):
for task_run in task_runs[task]:
assert task == task_run.task_id, task_runs

0 comments on commit 2431157

Please sign in to comment.