From f4faf422a54cba2e26415997637e8cb6e008fd3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Je=C5=99=C3=A1bek=20=28Jiri=20Jerabek=29?= Date: Fri, 29 Nov 2024 18:30:30 +0100 Subject: [PATCH] Init django-flags (#2374) * init django-flags * fix TemplateDoesNotExist * remove TEMPLATES --- galaxy_ng/app/settings.py | 4 ++++ requirements/requirements.common.txt | 5 ++++- requirements/requirements.insights.txt | 5 ++++- requirements/requirements.standalone.txt | 5 ++++- setup.py | 1 + 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/galaxy_ng/app/settings.py b/galaxy_ng/app/settings.py index 2cfcb9d605..1b3e78605a 100644 --- a/galaxy_ng/app/settings.py +++ b/galaxy_ng/app/settings.py @@ -109,6 +109,7 @@ 'crum', 'ansible_base.resource_registry', 'ansible_base.rbac', + 'flags', 'social_django', 'dynaconf_merge_unique', ] @@ -447,3 +448,6 @@ # https://github.com/ansible/django-ansible-base/pull/611 RENAMED_USERNAME_PREFIX = "galaxy_" + +# feature flags +FLAGS = {} diff --git a/requirements/requirements.common.txt b/requirements/requirements.common.txt index 473724ac37..b311ec417d 100644 --- a/requirements/requirements.common.txt +++ b/requirements/requirements.common.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # pip-compile --output-file=requirements/requirements.common.txt setup.py @@ -93,6 +93,7 @@ django==4.2.14 # django-auth-ldap # django-crum # django-filter + # django-flags # django-guid # django-import-export # django-lifecycle @@ -113,6 +114,8 @@ django-crum==0.7.9 # galaxy-ng (setup.py) django-filter==23.5 # via pulpcore +django-flags==5.0.13 + # via galaxy-ng (setup.py) django-guid==3.4.0 # via pulpcore django-import-export==3.3.9 diff --git a/requirements/requirements.insights.txt b/requirements/requirements.insights.txt index ed1a1da560..3b46210614 100644 --- a/requirements/requirements.insights.txt +++ b/requirements/requirements.insights.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # pip-compile --output-file=requirements/requirements.insights.txt requirements/requirements.insights.in setup.py @@ -106,6 +106,7 @@ django==4.2.14 # django-auth-ldap # django-crum # django-filter + # django-flags # django-guid # django-import-export # django-lifecycle @@ -127,6 +128,8 @@ django-crum==0.7.9 # galaxy-ng (setup.py) django-filter==23.5 # via pulpcore +django-flags==5.0.13 + # via galaxy-ng (setup.py) django-guid==3.4.0 # via pulpcore django-import-export==3.3.9 diff --git a/requirements/requirements.standalone.txt b/requirements/requirements.standalone.txt index fdd6f36c21..0823759bec 100644 --- a/requirements/requirements.standalone.txt +++ b/requirements/requirements.standalone.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # pip-compile --output-file=requirements/requirements.standalone.txt requirements/requirements.standalone.in setup.py @@ -93,6 +93,7 @@ django==4.2.14 # django-auth-ldap # django-crum # django-filter + # django-flags # django-guid # django-import-export # django-lifecycle @@ -113,6 +114,8 @@ django-crum==0.7.9 # galaxy-ng (setup.py) django-filter==23.5 # via pulpcore +django-flags==5.0.13 + # via galaxy-ng (setup.py) django-guid==3.4.0 # via pulpcore django-import-export==3.3.9 diff --git a/setup.py b/setup.py index f00bbeb4f3..1df0ce99b2 100644 --- a/setup.py +++ b/setup.py @@ -107,6 +107,7 @@ def run(self): "insights_analytics_collector>=0.3.0", "boto3", "distro", + "django-flags>=5.0.13", django_ansible_base_dependency, # noqa 501 "django-crum==0.7.9", # From vendored automated_logging