From f137ff7d4307b7c7e7dc2ae902730dbedd68c984 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Mon, 12 Apr 2021 15:14:27 -0400 Subject: [PATCH] update django-cors-headers and switch to inclusive settings name see: https://github.com/ansible/awx/issues/9177 --- docs/cors.md | 2 +- requirements/requirements.in | 2 +- requirements/requirements.txt | 11 +++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/cors.md b/docs/cors.md index 187d950e7a..a8a585aad1 100644 --- a/docs/cors.md +++ b/docs/cors.md @@ -6,7 +6,7 @@ AWX supports custom CORS headers via the Django CORS Middleware To define CORS-specific settings, add them to ``/etc/tower/conf.d/cors.py``: ```python -CORS_ORIGIN_WHITELIST = ( +CORS_ALLOWED_ORIGINS = ( 'hostname.example.com', '127.0.0.1:9000' ) diff --git a/requirements/requirements.in b/requirements/requirements.in index 0868e7979a..6997cf9c9b 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -12,7 +12,7 @@ daphne distro django==2.2.16 # see UPGRADE BLOCKERs django-auth-ldap -django-cors-headers +django-cors-headers>=3.5.0 django-crum django-extensions>=2.2.9 # https://github.com/ansible/awx/pull/6441 django-guid==2.2.0 # pinned to match Django 2.2 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index c9b4958537..85449b2311 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -70,9 +70,8 @@ cryptography==2.9.2 # pyopenssl # service-identity # social-auth-core -Cython==0.29.22 - # via - # -r /awx_devel/requirements/requirements.in +cython==0.29.22 + # via -r /awx_devel/requirements/requirements.in daphne==2.4.1 # via # -r /awx_devel/requirements/requirements.in @@ -88,7 +87,7 @@ distro==1.5.0 # via -r /awx_devel/requirements/requirements.in django-auth-ldap==2.1.0 # via -r /awx_devel/requirements/requirements.in -django-cors-headers==3.2.1 +django-cors-headers==3.7.0 # via -r /awx_devel/requirements/requirements.in django-crum==0.7.5 # via -r /awx_devel/requirements/requirements.in @@ -395,6 +394,8 @@ websocket-client==0.57.0 # via # kubernetes # slackclient +wheel==0.36.2 + # via -r /awx_devel/requirements/requirements.in xmlsec==1.3.3 # via python3-saml yarl==1.4.2 @@ -415,5 +416,3 @@ setuptools==41.6.0 # markdown # python-daemon # zope.interface -wheel==0.36.2 - # via -r /awx_devel/requirements/requirements.in