diff --git a/taskflow/backends/celery/celeryapp.py b/taskflow/backends/celery/celeryapp.py index 1f537b21..3bb3595b 100644 --- a/taskflow/backends/celery/celeryapp.py +++ b/taskflow/backends/celery/celeryapp.py @@ -34,13 +34,10 @@ def task_error_handler(signal=None, sender=None, task_id=None, 'failed with exception: %s' % (sender.name, task_id, args, kwargs, exception)) LOG.error('Trackeback: %s' % (tb.print_tb(traceback), )) - wf = sender.name.split('.')[0] - task = ('.').join(n for n in (sender.name.split('.')[1:]) if n) # TODO(jlucci): Auto-initiate rollback from failed task @task_success.connect def task_success_handler(singal=None, sender=None, result=None): """ Save task results to WF """ - wf = sender.name.split('.')[0] - task = ('.').join(n for n in (sender.name.split('.')[1:]) if n) + pass diff --git a/taskflow/db/sqlalchemy/models.py b/taskflow/db/sqlalchemy/models.py index 9ae67570..6f8a1501 100644 --- a/taskflow/db/sqlalchemy/models.py +++ b/taskflow/db/sqlalchemy/models.py @@ -22,10 +22,10 @@ SQLAlchemy models for taskflow data. import json from oslo.config import cfg -from sqlalchemy import Column, Integer, String, Table, MetaData +from sqlalchemy import Column, Integer, String, Table from sqlalchemy.exc import IntegrityError from sqlalchemy.ext.declarative import declarative_base -from sqlalchemy.orm import object_mapper, relationship, backref +from sqlalchemy.orm import object_mapper, relationship from sqlalchemy import DateTime, ForeignKey from sqlalchemy import types as types diff --git a/taskflow/patterns/distributed_flow.py b/taskflow/patterns/distributed_flow.py index 1c979682..3a12cb94 100644 --- a/taskflow/patterns/distributed_flow.py +++ b/taskflow/patterns/distributed_flow.py @@ -79,7 +79,7 @@ class Flow(object): # TODO(jlucci): Need to set up chord so that it's not executed # immediately. - c = chord(header, body=callback_task) + chord(header, body=callback_task) def run(self, context, *args, **kwargs): """ Start root task and kick off workflow """ diff --git a/taskflow/tests/unit/test_linear_flow.py b/taskflow/tests/unit/test_linear_flow.py index 65b6f6a7..2f1c92bc 100644 --- a/taskflow/tests/unit/test_linear_flow.py +++ b/taskflow/tests/unit/test_linear_flow.py @@ -16,7 +16,6 @@ # License for the specific language governing permissions and limitations # under the License. -import functools import unittest2 from taskflow import decorators diff --git a/taskflow/tests/unit/test_sql_db_api.py b/taskflow/tests/unit/test_sql_db_api.py index caf6f828..d8a9bbc9 100644 --- a/taskflow/tests/unit/test_sql_db_api.py +++ b/taskflow/tests/unit/test_sql_db_api.py @@ -21,13 +21,11 @@ import os import unittest2 from os import path -from oslo.config import cfg from taskflow.openstack.common import exception from taskflow.db import api as db_api from taskflow.db.sqlalchemy import models -from taskflow.db.sqlalchemy.session import get_session from taskflow import states db_api.configure() @@ -58,14 +56,14 @@ class JobTest(unittest2.TestCase): @classmethod def setUpClass(cls): wf_fmt = u'workflow_{0}' - lb_tmp = db_api.logbook_create('', u'logbook_1', 1) + db_api.logbook_create('', u'logbook_1', 1) cls.lb_ids.append(1) cls.lb_names.append(u'logbook_1') - job_tmp = db_api.job_create('', u'job_1', 1) + db_api.job_create('', u'job_1', 1) cls.job_ids.append(1) cls.job_names.append(u'job_1') for i in range(1, 10): - wf_tmp = db_api.workflow_create('', wf_fmt.format(i)) + db_api.workflow_create('', wf_fmt.format(i)) db_api.logbook_add_workflow('', 1, wf_fmt.format(i)) db_api.job_add_workflow('', 1, wf_fmt.format(i)) @@ -159,7 +157,7 @@ class JobTest(unittest2.TestCase): id = 1 while (self.job_ids.count(id) > 0): id = id + 1 - job_tmp = db_api.job_create('', u'job_{0}'.format(id), id) + db_api.job_create('', u'job_{0}'.format(id), id) self.job_ids.append(id) self.job_names.append(u'job_{0}'.format(id)) @@ -187,11 +185,11 @@ class LogBookTest(unittest2.TestCase): @classmethod def setUpClass(cls): wf_fmt = u'workflow_{0}' - lb_tmp = db_api.logbook_create('', u'logbook_1', 1) + db_api.logbook_create('', u'logbook_1', 1) cls.lb_ids.append(1) cls.lb_names.append(u'logbook_1') for i in range(1, 10): - wf_tmp = db_api.workflow_create('', wf_fmt.format(i)) + db_api.workflow_create('', wf_fmt.format(i)) db_api.logbook_add_workflow('', 1, wf_fmt.format(i)) @@ -232,7 +230,7 @@ class LogBookTest(unittest2.TestCase): id = 1 while (self.lb_ids.count(id) > 0): id = id + 1 - lb_tmp = db_api.logbook_create('', u'logbook_{0}'.format(id), id) + db_api.logbook_create('', u'logbook_{0}'.format(id), id) self.lb_ids.append(id) self.lb_names.append(u'logbook_{0}'.format(id)) @@ -295,8 +293,8 @@ class WorkflowTest(unittest2.TestCase): wf_fmt = u'workflow_{0}' tsk_fmt = u'task_{0}' for i in range(1, 10): - wf_tmp = db_api.workflow_create('', wf_fmt.format(i)) - tsk_tmp = db_api.task_create('', tsk_fmt.format(i), i, i) + db_api.workflow_create('', wf_fmt.format(i)) + db_api.task_create('', tsk_fmt.format(i), i, i) db_api.workflow_add_task('', wf_fmt.format(i), i) @@ -359,7 +357,7 @@ class WorkflowTest(unittest2.TestCase): u'workflow_9001') def test_workflow_add_task(self): - tsk_tmp = db_api.task_create('', u'task_10', 1, 10) + db_api.task_create('', u'task_10', 1, 10) db_api.workflow_add_task('', u'workflow_1', 10) self.tsk_ids.append(10) self.tsk_names.append('task_10') @@ -378,7 +376,7 @@ class WorkflowTest(unittest2.TestCase): id = 0 while (self.wf_ids.count(id) > 0): id = id + 1 - wf_tmp = db_api.workflow_create('', u'workflow_{0}'.format(id)) + db_api.workflow_create('', u'workflow_{0}'.format(id)) self.wf_ids.append(id) self.wf_names.append(u'workflow_{0}'.format(id)) @@ -405,7 +403,7 @@ class TaskTest(unittest2.TestCase): def setUpClass(cls): tsk_fmt = u'task_{0}' for i in range(1, 10): - tsk_tmp = db_api.task_create('', tsk_fmt.format(i), i, i) + db_api.task_create('', tsk_fmt.format(i), i, i) cls.tsk_ids.append(i) cls.tsk_names.append(tsk_fmt.format(i)) @@ -428,7 +426,7 @@ class TaskTest(unittest2.TestCase): id = 1 while (self.tsk_ids.count(id) > 0): id = id + 1 - tsk_tmp = db_api.task_create('', u'task_{0}'.format(id), 1, id) + db_api.task_create('', u'task_{0}'.format(id), 1, id) self.tsk_ids.append(id) self.tsk_names.append(u'task_{0}'.format(id)) diff --git a/tools/install_venv.py b/tools/install_venv.py index de37891a..19984b3b 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -24,7 +24,6 @@ Installation script for Taskflows's development virtualenv """ import os -import subprocess import sys import install_venv_common as install_venv diff --git a/tox.ini b/tox.ini index d147331c..45859699 100644 --- a/tox.ini +++ b/tox.ini @@ -39,6 +39,6 @@ setenv = NOSE_WITH_COVERAGE=1 commands = {posargs} [flake8] -ignore = E711,E712,F401,F403,F811,F841,H302,H303,H304,H401,H402,H403,H404 +ignore = H302,H303,H304,H401,H402,H403,H404 builtins = _ exclude = .venv,.tox,dist,doc,*openstack/common*,*egg,.git,build,tools \ No newline at end of file