Fix gates for Yoga and update Django

* Zuul deprecated (and now removed) declaring shared queues at a pipeline
  level [1]. This patch fixes the syntax to make the gate work for
  adjutant.
* Update TOX_CONSTRAINTS_FILE for stable/yoga
* Update .gitreview for stable/yoga
* Updates Django version to allow upper-constraints version

[1] https://lists.openstack.org/pipermail/openstack-discuss/2022-May/028603.html

Change-Id: I2e5721b2faaecdebaf00a24a5bc19987b200ad35
This commit is contained in:
Dale Smith 2022-12-15 12:44:41 +13:00
parent b305d7285f
commit d9ddbd6d3e
6 changed files with 12 additions and 11 deletions

View File

@ -2,3 +2,4 @@
host=review.opendev.org
port=29418
project=openstack/adjutant.git
defaultbranch=stable/yoga

View File

@ -11,6 +11,7 @@
- project:
queue: adjutant
templates:
- publish-openstack-docs-pti
- build-release-notes-jobs-python3
@ -20,6 +21,5 @@
jobs:
- adjutant-black-style-check
gate:
queue: adjutant
jobs:
- adjutant-black-style-check
- adjutant-black-style-check

View File

@ -211,10 +211,10 @@ class ResetUserPasswordAction(UserNameAction, UserMixin):
def _validate_user_roles(self):
id_manager = user_store.IdentityManager()
roles = id_manager.get_all_roles(self.user)
all_roles = id_manager.get_all_roles(self.user)
user_roles = []
for roles in roles.values():
for roles in all_roles.values():
user_roles.extend(role.name for role in roles)
if set(self.config.blacklisted_roles) & set(user_roles):

View File

@ -1,10 +1,10 @@
pbr>=5.2.0
Django>=2.2,<2.3
Django>=3.2.12
Babel>=2.6.0
decorator>=4.4.0
django-rest-swagger>=2.2.0
djangorestframework>=3.9.4
djangorestframework>=3.14.0
jsonfield>=2.0.2
keystoneauth1>=3.14.0
keystonemiddleware>=6.0.0

View File

@ -16,7 +16,7 @@ classifier =
Intended Audience :: Developers
Intended Audience :: System Administrators
License :: OSI Approved :: Apache Software License
Framework :: Django :: 2.2
Framework :: Django :: 3.2
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7

View File

@ -8,7 +8,7 @@ ignore_basepython_conflict = True
usedevelop = True
basepython = python3
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands =
@ -39,7 +39,7 @@ commands = {posargs}
[testenv:docs]
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga}
-r{toxinidir}/doc/requirements.txt
commands =
sphinx-build -W -b html -d doc/build/doctrees doc/source doc/build/html
@ -67,8 +67,8 @@ extension=.txt,.rst,.inc
[testenv:black]
commands =
black -t py36 .
black -t py38 --exclude /(\.tox|\.venv|.*venv.*|build|dist)/ .
[testenv:black_check]
commands =
black -t py36 --check .
black -t py38 --exclude /(\.tox|\.venv|.*venv.*|build|dist)/ --check .