taskflow 5.2.0__py3-none-any.whl → 5.4.0__py3-none-any.whl

taskflow/persistence/backends/impl_sqlalchemy.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 #    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #    Copyright (C) 2013 Rackspace Hosting All Rights Reserved.
 #
@@ -15,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import contextlib
 import copy
 import functools
 import threading
@@ -386,7 +383,7 @@ class Connection(base.Connection):
             # once it does not mean that we will be able to connect in
             # the future, so this is more of a sanity test and is not
             # complete connection insurance.
-            with contextlib.closing(engine.connect()):
+            with engine.connect():
                 pass
 
         _try_connect(self._engine)
@@ -394,7 +391,7 @@ class Connection(base.Connection):
     def upgrade(self):
         try:
             with self._upgrade_lock:
-                with contextlib.closing(self._engine.connect()) as conn:
+                with self._engine.connect() as conn:
                     # NOTE(imelnikov): Alembic does not support SQLite,
                     # and we don't recommend to use SQLite in production
                     # deployments, so migrations are rarely needed
@@ -402,7 +399,8 @@ class Connection(base.Connection):
                     # SQLite limitations, and create the database directly
                     # from the tables when it is in use...
                     if 'sqlite' in self._engine.url.drivername:
-                        self._metadata.create_all(bind=conn)
+                        with conn.begin():
+                            self._metadata.create_all(bind=conn)
                     else:
                         migration.db_sync(conn)
         except sa_exc.SQLAlchemyError:
@@ -538,7 +536,7 @@ class Connection(base.Connection):
     def get_logbook(self, book_uuid, lazy=False):
         try:
             logbooks = self._tables.logbooks
-            with contextlib.closing(self._engine.connect()) as conn:
+            with self._engine.connect() as conn:
                 q = (sql.select(logbooks).
                      where(logbooks.c.uuid == book_uuid))
                 row = conn.execute(q).first()
@@ -557,7 +555,7 @@ class Connection(base.Connection):
     def get_logbooks(self, lazy=False):
         gathered = []
         try:
-            with contextlib.closing(self._engine.connect()) as conn:
+            with self._engine.connect() as conn:
                 q = sql.select(self._tables.logbooks)
                 for row in conn.execute(q):
                     row = row._mapping
@@ -574,7 +572,7 @@ class Connection(base.Connection):
     def get_flows_for_book(self, book_uuid, lazy=False):
         gathered = []
         try:
-            with contextlib.closing(self._engine.connect()) as conn:
+            with self._engine.connect() as conn:
                 for fd in self._converter.flow_query_iter(conn, book_uuid):
                     if not lazy:
                         self._converter.populate_flow_detail(conn, fd)
@@ -626,7 +624,7 @@ class Connection(base.Connection):
     def get_atoms_for_flow(self, fd_uuid):
         gathered = []
         try:
-            with contextlib.closing(self._engine.connect()) as conn:
+            with self._engine.connect() as conn:
                 for ad in self._converter.atom_query_iter(conn, fd_uuid):
                     gathered.append(ad)
         except sa_exc.DBAPIError:

taskflow/test.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 #    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -26,6 +24,7 @@ from testtools import matchers
 from testtools import testcase
 
 from taskflow import exceptions
+from taskflow.tests import fixtures as taskflow_fixtures
 from taskflow.tests import utils
 from taskflow.utils import misc
 
@@ -92,6 +91,10 @@ class ItemsEqual(object):
 class TestCase(base.BaseTestCase):
     """Test case base class for all taskflow unit tests."""
 
+    def setUp(self):
+        super().setUp()
+        self.useFixture(taskflow_fixtures.WarningsFixture())
+
     def makeTmpDir(self):
         t_dir = self.useFixture(fixtures.TempDir())
         return t_dir.path

taskflow/tests/fixtures.py

@@ -0,0 +1,58 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import warnings
+
+import fixtures
+from sqlalchemy import exc as sqla_exc
+
+
+class WarningsFixture(fixtures.Fixture):
+    """Filters out warnings during test runs."""
+    def setUp(self):
+        super().setUp()
+
+        self._original_warning_filters = warnings.filters[:]
+
+        warnings.simplefilter('once', DeprecationWarning)
+
+        # The UUIDFields emits a warning if the value is not a valid UUID.
+        # Let's escalate that to an exception in the test to prevent adding
+        # violations.
+
+        warnings.filterwarnings('error', message='.*invalid UUID.*')
+
+        # Enable deprecation warnings for taskflow itself to capture upcoming
+        # SQLAlchemy changes
+        warnings.filterwarnings(
+            'ignore',
+            category=sqla_exc.SADeprecationWarning,
+        )
+
+        warnings.filterwarnings(
+            'error',
+            module='taskflow',
+            category=sqla_exc.SADeprecationWarning,
+        )
+
+        # Enable general SQLAlchemy warnings also to ensure we're not doing
+        # silly stuff. It's possible that we'll need to filter things out here
+        # with future SQLAlchemy versions, but that's a good thing
+        warnings.filterwarnings(
+            'error',
+            module='taskflow',
+            category=sqla_exc.SAWarning,
+        )
+        self.addCleanup(self._reset_warning_filters)
+
+    def _reset_warning_filters(self):
+        warnings.filters[:] = self._original_warning_filters

taskflow/tests/unit/test_utils.py

@@ -154,10 +154,10 @@ class UriParseTest(test.TestCase):
         self.assertEqual('', parsed.path)
 
     def test_ipv6_host(self):
-        url = "rsync://[2001:db8:0:1]:873"
+        url = "rsync://[2001:db8:0:1::2]:873"
         parsed = misc.parse_uri(url)
         self.assertEqual('rsync', parsed.scheme)
-        self.assertEqual('2001:db8:0:1', parsed.hostname)
+        self.assertEqual('2001:db8:0:1::2', parsed.hostname)
         self.assertEqual(873, parsed.port)
 
     def test_user_password(self):

{taskflow-5.2.0.dist-info → taskflow-5.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: taskflow
-Version: 5.2.0
+Version: 5.4.0
 Summary: Taskflow structured state management library.
 Home-page: https://docs.openstack.org/taskflow/latest/
 Author: OpenStack
@@ -8,7 +8,7 @@ Author-email: openstack-discuss@lists.openstack.org
 License: UNKNOWN
 Keywords: reliable,tasks,execution,parallel,dataflow,workflows,distributed
 Platform: UNKNOWN
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: OpenStack
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
@@ -45,7 +45,7 @@ Requires-Dist: psycopg2 (>=2.8.0) ; extra == 'database'
 Provides-Extra: eventlet
 Requires-Dist: eventlet (!=0.18.3,!=0.20.1,!=0.21.0,>=0.18.2) ; extra == 'eventlet'
 Provides-Extra: redis
-Requires-Dist: redis (>=2.10.0) ; extra == 'redis'
+Requires-Dist: redis (>=3.0.0) ; extra == 'redis'
 Provides-Extra: test
 Requires-Dist: hacking (<0.11,>=0.10.0) ; extra == 'test'
 Requires-Dist: mock (>=2.0.0) ; extra == 'test'

{taskflow-5.2.0.dist-info → taskflow-5.4.0.dist-info}/RECORD

@@ -9,7 +9,7 @@ taskflow/retry.py,sha256=Dk-IcdPi5n2502fzmVMjrWLzlrXp6h1ak_xOpOWoh6s,14537
 taskflow/states.py,sha256=3MRdAfs0x94QhDjl-RGyTfxAbkL3APtNr_qQf6apqbE,6901
 taskflow/storage.py,sha256=HZPfmUhqN33DRO8oo3b9mXQSSSuxt5fKkXVzQTwXPPw,52046
 taskflow/task.py,sha256=qw79ho1bhwe5KttSPjalfUlCTfLUjNGc1twNdTFMi4w,10052
-taskflow/test.py,sha256=nXBrBMTvngfysSTuaNOy14a0yTzax5HSVFFCguXBU0E,10317
+taskflow/test.py,sha256=iIHle3qsM2980YPVfPDMJ8q1bpzqkmQjvreAUlMTrX4,10456
 taskflow/version.py,sha256=QWhiNICILD4xTAZPrJVUF9dsH-VoCHbHsKuwPA3IMrE,1263
 taskflow/conductors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskflow/conductors/base.py,sha256=k7E_zu9CIORhODWzwmxh7w8fSNhG6dJaYEfLwIxhxXE,7332
@@ -125,7 +125,7 @@ taskflow/persistence/path_based.py,sha256=0d4I9HgTdAhJarxEJkRiZNNxC-M2tbQebeDLby
 taskflow/persistence/backends/__init__.py,sha256=z5k5CZNjtbKvj2uxqNrdPmREDUGlTMrthcC723gPnsg,3352
 taskflow/persistence/backends/impl_dir.py,sha256=t8YQe4llF4ghguTh45BBEzRvvtpCllaAbuFZhOY_4os,6085
 taskflow/persistence/backends/impl_memory.py,sha256=PHKHqeV_KkkwCpT42J2j22o8gfdjAKt3recCP6k5TUw,13390
-taskflow/persistence/backends/impl_sqlalchemy.py,sha256=ayEkxlN-vocYZNMyi4HO-8Fhocak8VsPbrN7nqExphQ,25656
+taskflow/persistence/backends/impl_sqlalchemy.py,sha256=4YJp88fb2rfDw6Pxrnfebxpo1DhtY_fu8q_8BEnuwWk,25540
 taskflow/persistence/backends/impl_zookeeper.py,sha256=PaJmf-xDk7udmYzrMxRM-ARrd1HfAucqQjYIljmpixM,6188
 taskflow/persistence/backends/sqlalchemy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskflow/persistence/backends/sqlalchemy/migration.py,sha256=YS4UPcygmYV1lRTogPUuyMM39DupIZ1LwuD23yoaEno,1140
@@ -146,6 +146,7 @@ taskflow/persistence/backends/sqlalchemy/alembic/versions/6df9422fcb43_fix_flowd
 taskflow/persistence/backends/sqlalchemy/alembic/versions/84d6e888850_add_task_detail_type.py,sha256=PG7eTGhTsmUbnD02Pyn-SQqC5f7544cYdTtvnnE0xBA,1315
 taskflow/persistence/backends/sqlalchemy/alembic/versions/README,sha256=AwegmiWc0MVoYyckyRzPFV4kVZqs8Q4w6eeMm0K3I_o,38
 taskflow/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+taskflow/tests/fixtures.py,sha256=VfGlusX2q79_ktPME4cm1qt_gN9VNRAwyYy5sDBAX0Y,2004
 taskflow/tests/test_examples.py,sha256=g2zhguLKE4Tex2e_vSmKMhsNXItnKWj89_VbnmgGejU,4925
 taskflow/tests/utils.py,sha256=P6RPD2w5h00KAse7r31LC9tJils0jaeiUx5QiVqLOA0,11157
 taskflow/tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -171,7 +172,7 @@ taskflow/tests/unit/test_storage.py,sha256=SlShgJ4hirdnggDkpB3GoosY--4B0PqMOVvMB
 taskflow/tests/unit/test_suspend.py,sha256=j4M5J2G1aoGUJb111_xUUb0oYJfgRo9hC4ZFyr-00d4,9900
 taskflow/tests/unit/test_task.py,sha256=PGXlOIhpYdCo8hTScleIHxQ5gGa-1b1MJhwaiB_fQss,15947
 taskflow/tests/unit/test_types.py,sha256=uecv0lBqPAfAdTDXYMoM8Pi-P9JROR-aA_xkK0trJSQ,20225
-taskflow/tests/unit/test_utils.py,sha256=WnTW4hVhq16O0I88K1oMEv1X8x1DMMaK8H_wT2q9W8E,11029
+taskflow/tests/unit/test_utils.py,sha256=m5Wct0kqv8CoX03sUBXcVczAuGcF-AQtbYPxUDq64oo,11035
 taskflow/tests/unit/test_utils_async_utils.py,sha256=BkVaxbRO3XX2ueAy6kSplq4D1SVos8DOaf9V1mueEf4,981
 taskflow/tests/unit/test_utils_binary.py,sha256=OdF2BIeUCIP4hXi6QsYv8IqZtDpmqCZySlv5nLZ6UOk,3168
 taskflow/tests/unit/test_utils_iter_utils.py,sha256=jzUJzUtfL1EPRoQLoUzZ0chlkuTKoqQKHjz7F-LaZ3Y,5716
@@ -231,11 +232,11 @@ taskflow/utils/persistence_utils.py,sha256=GWceOcxdfsf-MtrdR74xmC2khClF8im6DpZmR
 taskflow/utils/redis_utils.py,sha256=zJBvXmlNZUQ_gwGZAaNLySVtCtou3YayHAkGSCNKDUw,4345
 taskflow/utils/schema_utils.py,sha256=Zf6eL0NK0_TVFD_Sc1yEZYswFz9K0tet1Dmj48F8uMA,1434
 taskflow/utils/threading_utils.py,sha256=eiaNUK127DOBr_zfj3-j4Oi5a2dsD7VunVeTYN6NjPo,5849
-taskflow-5.2.0.dist-info/AUTHORS,sha256=8LPPL_6_SL4FA3G4Fj_pa8s7JbrrSS3vOkZgjQmB_3k,4485
-taskflow-5.2.0.dist-info/LICENSE,sha256=0t4vVm0tDgtQn7DqH6Nmn0kGSrHeIcV0U8qzdQojTo8,10143
-taskflow-5.2.0.dist-info/METADATA,sha256=mCTjNSQQ6d7dW7-_Yallj87W2TVCEjRuxDEtIot-y7k,5087
-taskflow-5.2.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-taskflow-5.2.0.dist-info/entry_points.txt,sha256=MGjjnng_YpSJs9BMAJBC2hJnljMV0pNllXl_5VoHJV0,1183
-taskflow-5.2.0.dist-info/pbr.json,sha256=21TJbvAYsMpxXC6nA14I-JZJRWCNcA1fGGFOZBla3iM,47
-taskflow-5.2.0.dist-info/top_level.txt,sha256=PsdN41vwysesDlqHCSVVXH4mkTMdMiZFW_yHEAXiZE4,9
-taskflow-5.2.0.dist-info/RECORD,,
+taskflow-5.4.0.dist-info/AUTHORS,sha256=8LPPL_6_SL4FA3G4Fj_pa8s7JbrrSS3vOkZgjQmB_3k,4485
+taskflow-5.4.0.dist-info/LICENSE,sha256=0t4vVm0tDgtQn7DqH6Nmn0kGSrHeIcV0U8qzdQojTo8,10143
+taskflow-5.4.0.dist-info/METADATA,sha256=9gmKe2v-5fXSHtdidp4MRp02KT_r_G8Co_99thivb5M,5099
+taskflow-5.4.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
+taskflow-5.4.0.dist-info/entry_points.txt,sha256=MGjjnng_YpSJs9BMAJBC2hJnljMV0pNllXl_5VoHJV0,1183
+taskflow-5.4.0.dist-info/pbr.json,sha256=L8tTrR99JPU614KOf2SnnXLM42vcOpjv6SkHE658MRc,47
+taskflow-5.4.0.dist-info/top_level.txt,sha256=PsdN41vwysesDlqHCSVVXH4mkTMdMiZFW_yHEAXiZE4,9
+taskflow-5.4.0.dist-info/RECORD,,

taskflow-5.4.0.dist-info/pbr.json

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

taskflow-5.2.0.dist-info/pbr.json

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