Merge "Update .gitreview for stable/wallaby" into stable/wallaby

Update TOX_CONSTRAINTS_FILE for stable/wallaby
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/wallaby branch, tests will continue to use the upper-constraints list on master. Change-Id: I5986087281694580acc3c19feed461b5949f7001
2021-07-01 13:32:11 +00:00 · 2021-07-01 11:44:53 +00:00 · 2021-07-01 11:44:34 +00:00 · 2021-07-01 09:11:58 +00:00
3 changed files with 9 additions and 6 deletions
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/watcher.git
+defaultbranch=stable/wallaby
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,7 @@ install_command = pip install {opts} {packages}
 setenv =
   VIRTUAL_ENV={envdir}
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
    -r{toxinidir}/test-requirements.txt
    -r{toxinidir}/requirements.txt
 commands =
@@ -31,7 +31,7 @@ commands =
 [testenv:venv]
 setenv = PYTHONHASHSEED=0
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
    -r{toxinidir}/doc/requirements.txt
    -r{toxinidir}/test-requirements.txt
    -r{toxinidir}/requirements.txt
@@ -49,7 +49,9 @@ commands =

 [testenv:docs]
 setenv = PYTHONHASHSEED=0
-deps = -r{toxinidir}/doc/requirements.txt
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -r{toxinidir}/doc/requirements.txt
 commands =
  rm -fr doc/build doc/source/api/ .autogenerated
  sphinx-build -W --keep-going -b html doc/source doc/build/html
--- a/watcher/db/sqlalchemy/api.py
+++ b/watcher/db/sqlalchemy/api.py
@@ -278,7 +278,7 @@ class Connection(api.BaseConnection):
            query = model_query(model, session=session)
            query = add_identity_filter(query, id_)
            try:
-                ref = query.with_lockmode('update').one()
+                ref = query.with_for_update().one()
            except exc.NoResultFound:
                raise exception.ResourceNotFound(name=model.__name__, id=id_)

@@ -815,7 +815,7 @@ class Connection(api.BaseConnection):
            query = model_query(models.Action, session=session)
            query = add_identity_filter(query, action_id)
            try:
-                ref = query.with_lockmode('update').one()
+                ref = query.with_for_update().one()
            except exc.NoResultFound:
                raise exception.ActionNotFound(action=action_id)

@@ -900,7 +900,7 @@ class Connection(api.BaseConnection):
            query = model_query(models.ActionPlan, session=session)
            query = add_identity_filter(query, action_plan_id)
            try:
-                ref = query.with_lockmode('update').one()
+                ref = query.with_for_update().one()
            except exc.NoResultFound:
                raise exception.ActionPlanNotFound(action_plan=action_plan_id)
Author	SHA1	Message	Date
Zuul	d60e2a96e4	Merge "Update .gitreview for stable/wallaby" into stable/wallaby	2021-07-01 13:32:11 +00:00
OpenStack Release Bot	adf4725f8c	Update TOX_CONSTRAINTS_FILE for stable/wallaby 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/wallaby branch, tests will continue to use the upper-constraints list on master. Change-Id: I5986087281694580acc3c19feed461b5949f7001	2021-07-01 11:44:53 +00:00
OpenStack Release Bot	537823b216	Update .gitreview for stable/wallaby Change-Id: Ic8aa9518d5ccc65d43444d42c584db476cd79429	2021-07-01 11:44:34 +00:00
ericxiett	281455a08a	Replace deprecated with_lockmode with with_for_update The Query.with_lockmode() method is deprecated since version 0.9.0 and will be removed in a future release. [1] This patch replaces it with Query.with_for_update(). The 'faultstring' was been modified to 'Exactly 5 or 6 columns has to be specified for iterator expression', so adds one space between "iterator" and "expression" for 'expected_error_msg'. Also use upper-constraints in doc build to avoid issues in pdf build. [1] https://docs.sqlalchemy.org/en/13/orm/query.html#sqlalchemy.orm.query.Query.with_lockmode Closes-Bug: #1933226 Change-Id: I0ad514da647bb08790259fd27e56a41f6dbbbaa0 (cherry picked from commit `9ca44fa3ab`)	2021-07-01 09:11:58 +00:00