Skip to content

Commit

Permalink
feat: enable django flags support
Browse files Browse the repository at this point in the history
  • Loading branch information
pb82 committed Nov 28, 2024
1 parent 699c0c7 commit dadba27
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
5 changes: 5 additions & 0 deletions awx/settings/defaults.py
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@
'django.template.context_processors.static',
'django.template.context_processors.tz',
'django.contrib.messages.context_processors.messages',
'django.template.context_processors.request',
'awx.ui.context_processors.csp',
'awx.ui.context_processors.version',
],
Expand Down Expand Up @@ -357,6 +358,7 @@
'ansible_base.jwt_consumer',
'ansible_base.resource_registry',
'ansible_base.rbac',
'flags',
]


Expand Down Expand Up @@ -1052,3 +1054,6 @@

# system username for django-ansible-base
SYSTEM_USERNAME = None

# feature flags
FLAGS = {}
2 changes: 1 addition & 1 deletion requirements/requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ setuptools # see UPGRADE BLOCKERs
setuptools_scm[toml] # see UPGRADE BLOCKERs, xmlsec build dep
setuptools-rust>=0.11.4 # cryptography build dep
pkgconfig>=1.5.1 # xmlsec build dep - needed for offline build

django-flags>=5.0.13
# Temporarily added to use ansible-runner from git branch, to be removed
# when ansible-runner moves from requirements_git.txt to here
pbr
7 changes: 3 additions & 4 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ asgiref==3.7.2
# channels-redis
# daphne
# django
# django-ansible-base
# django-cors-headers
asn1==2.7.0
# via -r /awx_devel/requirements/requirements.in
Expand Down Expand Up @@ -130,6 +129,7 @@ django==4.2.16
# django-cors-headers
# django-crum
# django-extensions
# django-flags
# django-guid
# django-oauth-toolkit
# django-polymorphic
Expand All @@ -145,6 +145,8 @@ django-crum==0.7.9
# django-ansible-base
django-extensions==3.2.3
# via -r /awx_devel/requirements/requirements.in
django-flags==5.0.13
# via -r /awx_devel/requirements/requirements.in
django-guid==3.5.0
# via -r /awx_devel/requirements/requirements.in
django-oauth-toolkit==1.7.1
Expand Down Expand Up @@ -369,7 +371,6 @@ pygerduty==0.38.3
pyjwt[crypto]==2.8.0
# via
# adal
# django-ansible-base
# msal
# twilio
pyopenssl==24.0.0
Expand Down Expand Up @@ -422,7 +423,6 @@ requests==2.31.0
# -r /awx_devel/requirements/requirements.in
# adal
# azure-core
# django-ansible-base
# django-oauth-toolkit
# kubernetes
# msal
Expand Down Expand Up @@ -501,7 +501,6 @@ typing-extensions==4.9.0
urllib3==1.26.18
# via
# botocore
# django-ansible-base
# kubernetes
# requests
uwsgi==2.0.24
Expand Down

0 comments on commit dadba27

Please sign in to comment.