taskflow 6.0.0__tar.gz → 6.0.2__tar.gz

{taskflow-6.0.0 → taskflow-6.0.2}/AUTHORS

@@ -9,6 +9,7 @@ Ann Taraday <akamyshnikova@mirantis.com>
 Atsushi SAKAI <sakaia@jp.fujitsu.com>
 Balaji Narayanan <lists@balajin.net>
 Ben Nemec <bnemec@redhat.com>
+Brett Delle Grazie <brett.dellegrazie@gmail.com>
 Brian Jarrett <celttechie@gmail.com>
 ChangBo Guo(gcb) <eric.guo@easystack.cn>
 Changbin Liu <changbl@research.att.com>

{taskflow-6.0.0 → taskflow-6.0.2}/ChangeLog

@@ -1,6 +1,19 @@
 CHANGES
 =======
 
+6.0.2
+-----
+
+* Bump etcd to 3.5.x
+* Allow overriding etcd version in tests
+* fix(conductor): add stop and wait methods to base
+
+6.0.1
+-----
+
+* Fix skipped database persistence tests
+* Fix duplicate table\_name argument
+
 6.0.0
 -----
 

{taskflow-6.0.0 → taskflow-6.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: taskflow
-Version: 6.0.0
+Version: 6.0.2
 Summary: Taskflow structured state management library.
 Home-page: https://docs.openstack.org/taskflow/latest/
 Author: OpenStack

{taskflow-6.0.0 → taskflow-6.0.2}/setup-etcd-env.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eux
 if [ -z "$(which etcd)" ]; then
-    ETCD_VERSION=3.4.27
+    ETCD_VERSION=${ETCD_VERSION:-3.5.21}
     case `uname -s` in
         Darwin)
             OS=darwin

{taskflow-6.0.0 → taskflow-6.0.2}/taskflow/conductors/backends/impl_executor.py

@@ -121,16 +121,12 @@ class ExecutorConductor(base.Conductor, metaclass=abc.ABCMeta):
                                        " it has not been")
 
     def stop(self):
-        """Requests the conductor to stop dispatching.
-
-        This method can be used to request that a conductor stop its
-        consumption & dispatching loop.
-
-        The method returns immediately regardless of whether the conductor has
-        been stopped.
-        """
         self._wait_timeout.interrupt()
 
+    # Inherit the docs, so we can reference them in our class docstring,
+    # if we don't do this sphinx gets confused...
+    stop.__doc__ = base.Conductor.stop.__doc__
+
     @property
     def dispatching(self):
         """Whether or not the dispatching loop is still dispatching."""
@@ -342,14 +338,8 @@ class ExecutorConductor(base.Conductor, metaclass=abc.ABCMeta):
     run.__doc__ = base.Conductor.run.__doc__
 
     def wait(self, timeout=None):
-        """Waits for the conductor to gracefully exit.
-
-        This method waits for the conductor to gracefully exit. An optional
-        timeout can be provided, which will cause the method to return
-        within the specified timeout. If the timeout is reached, the returned
-        value will be ``False``, otherwise it will be ``True``.
-
-        :param timeout: Maximum number of seconds that the :meth:`wait` method
-                        should block for.
-        """
         return self._dead.wait(timeout)
+
+    # Inherit the docs, so we can reference them in our class docstring,
+    # if we don't do this sphinx gets confused...
+    wait.__doc__ = base.Conductor.wait.__doc__

{taskflow-6.0.0 → taskflow-6.0.2}/taskflow/conductors/base.py

@@ -161,6 +161,30 @@ class Conductor(metaclass=abc.ABCMeta):
                                forever and/or until stopped).
         """
 
+    @abc.abstractmethod
+    def stop(self):
+        """Requests the conductor to stop dispatching.
+
+        This method can be used to request that a conductor stop its
+        consumption & dispatching loop.
+
+        The method returns immediately regardless of whether the conductor has
+        been stopped.
+        """
+
+    @abc.abstractmethod
+    def wait(self, timeout=None):
+        """Waits for the conductor to gracefully exit.
+
+        This method waits for the conductor to gracefully exit. An optional
+        timeout can be provided, which will cause the method to return
+        within the specified timeout. If the timeout is reached, the returned
+        value will be ``False``, otherwise it will be ``True``.
+
+        :param timeout: Maximum number of seconds that the :meth:`wait` method
+                        should block for.
+        """
+
     @abc.abstractmethod
     def _dispatch_job(self, job):
         """Dispatches a claimed job for work completion.

{taskflow-6.0.0 → taskflow-6.0.2}/taskflow/persistence/backends/sqlalchemy/alembic/versions/00af93df9d77_add_unique_into_all_indexes.py

@@ -33,7 +33,6 @@ def upgrade():
             batch_op.drop_index("logbook_uuid_idx")
             batch_op.create_index(
                 index_name="logbook_uuid_idx",
-                table_name="logbooks",
                 columns=['uuid'],
                 unique=True)
 
@@ -41,7 +40,6 @@ def upgrade():
             batch_op.drop_index("flowdetails_uuid_idx")
             batch_op.create_index(
                 index_name="flowdetails_uuid_idx",
-                table_name="flowdetails",
                 columns=['uuid'],
                 unique=True)
 
@@ -49,7 +47,6 @@ def upgrade():
             batch_op.drop_index("taskdetails_uuid_idx")
             batch_op.create_index(
                 index_name="taskdetails_uuid_idx",
-                table_name="atomdetails",
                 columns=['uuid'],
                 unique=True)
 
@@ -62,19 +59,16 @@ def downgrade():
             batch_op.drop_index("logbook_uuid_idx")
             batch_op.create_index(
                 index_name="logbook_uuid_idx",
-                table_name="logbooks",
                 columns=['uuid'])
 
         with op.batch_alter_table("flowdetails") as batch_op:
             batch_op.drop_index("flowdetails_uuid_idx")
             batch_op.create_index(
                 index_name="flowdetails_uuid_idx",
-                table_name="flowdetails",
                 columns=['uuid'])
 
         with op.batch_alter_table("atomdetails") as batch_op:
             batch_op.drop_index("taskdetails_uuid_idx")
             batch_op.create_index(
                 index_name="taskdetails_uuid_idx",
-                table_name="atomdetails",
                 columns=['uuid'])

{taskflow-6.0.0 → taskflow-6.0.2}/taskflow/tests/unit/persistence/test_sql_persistence.py

@@ -173,7 +173,7 @@ class MysqlPersistenceTest(BackendPersistenceTestMixin, test.TestCase):
             db_uri = _get_connect_string('mysql', USER, PASSWD)
             engine = sa.create_engine(db_uri)
             with contextlib.closing(engine.connect()) as conn:
-                conn.execute("CREATE DATABASE %s" % DATABASE)
+                conn.execute(sa.text("CREATE DATABASE %s" % DATABASE))
         except Exception as e:
             raise Exception('Failed to initialize MySQL db: %s' % (e))
         finally:
@@ -190,7 +190,7 @@ class MysqlPersistenceTest(BackendPersistenceTestMixin, test.TestCase):
         try:
             engine = sa.create_engine(self.db_uri)
             with contextlib.closing(engine.connect()) as conn:
-                conn.execute("DROP DATABASE IF EXISTS %s" % DATABASE)
+                conn.execute(sa.text("DROP DATABASE IF EXISTS %s" % DATABASE))
         except Exception as e:
             raise Exception('Failed to remove temporary database: %s' % (e))
         finally:
@@ -215,7 +215,7 @@ class PostgresPersistenceTest(BackendPersistenceTestMixin, test.TestCase):
             engine = sa.create_engine(db_uri)
             with contextlib.closing(engine.connect()) as conn:
                 conn.connection.set_isolation_level(0)
-                conn.execute("CREATE DATABASE %s" % DATABASE)
+                conn.execute(sa.text("CREATE DATABASE %s" % DATABASE))
                 conn.connection.set_isolation_level(1)
         except Exception as e:
             raise Exception('Failed to initialize PostgreSQL db: %s' % (e))
@@ -239,7 +239,7 @@ class PostgresPersistenceTest(BackendPersistenceTestMixin, test.TestCase):
             engine = sa.create_engine(db_uri)
             with contextlib.closing(engine.connect()) as conn:
                 conn.connection.set_isolation_level(0)
-                conn.execute("DROP DATABASE IF EXISTS %s" % DATABASE)
+                conn.execute(sa.text("DROP DATABASE IF EXISTS %s" % DATABASE))
                 conn.connection.set_isolation_level(1)
         except Exception as e:
             raise Exception('Failed to remove temporary database: %s' % (e))

{taskflow-6.0.0 → taskflow-6.0.2}/taskflow.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: taskflow
-Version: 6.0.0
+Version: 6.0.2
 Summary: Taskflow structured state management library.
 Home-page: https://docs.openstack.org/taskflow/latest/
 Author: OpenStack

taskflow-6.0.2/taskflow.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "bad7ab98", "is_release": true}

{taskflow-6.0.0 → taskflow-6.0.2}/tox.ini

@@ -27,6 +27,8 @@ commands =
 allowlist_externals =
   find
   ./setup-etcd-env.sh
+passenv =
+  ETCD_VERSION
 
 [testenv:update-states]
 deps =

taskflow-6.0.0/taskflow.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "32a8d257", "is_release": true}