From 717524bb1c771dc9e6780d0336b22dbba3498506 Mon Sep 17 00:00:00 2001 From: Bill Wei Date: Tue, 30 Jan 2024 15:24:07 -0500 Subject: [PATCH] fix: importing package from ansible_base.lib (#633) --- poetry.lock | 9 ++++++--- src/aap_eda/wsapi/routes.py | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/poetry.lock b/poetry.lock index fd4b83797..e274424ae 100644 --- a/poetry.lock +++ b/poetry.lock @@ -603,6 +603,7 @@ cryptography = "*" Django = ">=4.2.5,<4.3.0" django-auth-ldap = {version = "*", optional = true, markers = "extra == \"authentication\""} django-crum = "*" +django-split-settings = "*" djangorestframework = "*" inflection = "*" python-ldap = {version = "*", optional = true, markers = "extra == \"authentication\""} @@ -611,16 +612,18 @@ social-auth-app-django = {version = "*", optional = true, markers = "extra == \" tabulate = {version = "*", optional = true, markers = "extra == \"authentication\""} [package.extras] -all = ["channels", "django-auth-ldap", "drf-spectacular", "python-ldap", "python3-saml", "social-auth-app-django", "tabulate"] +all = ["channels", "cryptography", "django-auth-ldap", "drf-spectacular", "pyjwt", "pytest", "pytest-django", "python-ldap", "python3-saml", "requests", "social-auth-app-django", "tabulate"] +api-documentation = ["drf-spectacular"] authentication = ["django-auth-ldap", "python-ldap", "python3-saml", "social-auth-app-django", "tabulate"] channel-auth = ["channels"] -swagger = ["drf-spectacular"] +jwt-consumer = ["pyjwt", "requests"] +testing = ["cryptography", "pytest", "pytest-django"] [package.source] type = "git" url = "https://github.com/ansible/django-ansible-base.git" reference = "devel" -resolved_reference = "a8525aceda31d2a79058e0952ac0688e28ebf109" +resolved_reference = "a84bdef8b0bd856ead8b910381d2ffd277925ed2" [[package]] name = "django-auth-ldap" diff --git a/src/aap_eda/wsapi/routes.py b/src/aap_eda/wsapi/routes.py index fe85a7a67..0e34fc5eb 100644 --- a/src/aap_eda/wsapi/routes.py +++ b/src/aap_eda/wsapi/routes.py @@ -1,4 +1,4 @@ -from ansible_base.channels.middleware import DrfAuthMiddlewareStack +from ansible_base.lib.channels.middleware import DrfAuthMiddlewareStack from channels.routing import URLRouter from channels.security.websocket import AllowedHostsOriginValidator from django.conf import settings