From d4e07769dac7e1b5fec5d7d2649a2aecd466b538 Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Fri, 14 Mar 2025 18:01:21 +0000 Subject: [PATCH 1/5] Update .gitreview for stable/2025.1 Change-Id: I0dee7ac3147bc3cef9fde3dfc8c88b2842c8b337 --- .gitreview | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitreview b/.gitreview index a5276187e..6689146ec 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=review.opendev.org port=29418 project=openstack/taskflow.git +defaultbranch=stable/2025.1 From a1d1b83b6c2a31cd993c179bb60521002b054f44 Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Fri, 14 Mar 2025 18:01:22 +0000 Subject: [PATCH 2/5] Update TOX_CONSTRAINTS_FILE for stable/2025.1 Update the URL to the upper-constraints file to point to the redirect rule on releases.openstack.org so that anyone working on this branch will switch to the correct upper-constraints list automatically when the requirements repository branches. Until the requirements repository has as stable/2025.1 branch, tests will continue to use the upper-constraints list on master. Change-Id: I04606aaf0475e7d7561d560d5d3284d34ec5295d --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 0017ca7f6..5feb679ad 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ envlist = cover,docs,pep8,py3,pylint,update-states # We need to install a bit more than just `test' because those drivers have # custom tests that we always run deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.1} -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt commands = From e70d913271c9ec70e291d744ba42a3278ac51737 Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Sat, 15 Mar 2025 17:38:13 -0700 Subject: [PATCH 3/5] Keep taskflow doc job on Ubuntu Jammy It seems taskflow doc build is not ready for Noble[1] keep it running on jammy until issue is fixed - https://lists.openstack.org/archives/list/openstack-discuss@lists.openstack.org/thread/XFB5JYYK4LOBN24H77S27QDKABFPMJA5/ Change-Id: I62c4905a7a6a2b55aee8c64bbdc57bbcc2eef5ee (cherry picked from commit 44b2aaddd69ab73f3854975b953ca2184dc29cfe) --- .zuul.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.zuul.yaml b/.zuul.yaml index 07cdf9d4c..dce959552 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -38,9 +38,13 @@ - release-notes-jobs-python3 check: jobs: + - openstack-tox-docs: + nodeset: ubuntu-jammy - taskflow-functional-redis - taskflow-functional-etcd gate: jobs: + - openstack-tox-docs: + nodeset: ubuntu-jammy - taskflow-functional-redis - taskflow-functional-etcd From 5cdfd861c54be39c001d6dcfe81990b1e1887a88 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 27 May 2025 20:47:06 +0900 Subject: [PATCH 4/5] Fix skipped database persistence tests Change-Id: I786465ba28e9df9b4c1b2c1abbb163cbed15d8a2 (cherry picked from commit c7aac5b751194d3fbd9a15c32a4a281b88eb2ac3) --- taskflow/tests/unit/persistence/test_sql_persistence.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/taskflow/tests/unit/persistence/test_sql_persistence.py b/taskflow/tests/unit/persistence/test_sql_persistence.py index 5a1917c47..91e2675c1 100644 --- a/taskflow/tests/unit/persistence/test_sql_persistence.py +++ b/taskflow/tests/unit/persistence/test_sql_persistence.py @@ -175,7 +175,7 @@ def _init_db(self): 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: @@ -192,7 +192,7 @@ def _remove_db(self): 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: @@ -217,7 +217,7 @@ def _init_db(self): 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)) @@ -241,7 +241,7 @@ def _remove_db(self): 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)) From 43e6159742240b3923b316e2278d59dabefd481c Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 31 Aug 2026 20:30:50 +0900 Subject: [PATCH 5/5] stable-only: Pin setuptools zake requires pkg_resources which was removed in recent setuptools. Change-Id: I0677faaed7a8f5ac65c95bdf896a63cf5e82e05e Signed-off-by: Takashi Kajinami (cherry picked from commit fdbbdbca4d9b285422cec955196656f1257c7f0b) --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index 5feb679ad..dc311fbaa 100644 --- a/tox.ini +++ b/tox.ini @@ -9,6 +9,8 @@ deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.1} -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt + # we need pkg_resources because of zake + setuptools<82 commands = stestr run {posargs}