From 9eb9057b496fcad9ca5727b859eced520621a79d Mon Sep 17 00:00:00 2001 From: andrey-canon Date: Thu, 10 Aug 2023 13:49:55 -0500 Subject: [PATCH] feat: revert mandatory eox-audit-model dependency --- eox_nelp/api_clients/certificates.py | 8 +++++++- requirements/base.in | 1 - requirements/base.txt | 27 +++++++++------------------ requirements/pip-tools.txt | 5 ++--- requirements/test.txt | 21 +++++++-------------- requirements/tox.txt | 4 ++-- 6 files changed, 27 insertions(+), 39 deletions(-) diff --git a/eox_nelp/api_clients/certificates.py b/eox_nelp/api_clients/certificates.py index 852e37c7..b8703185 100644 --- a/eox_nelp/api_clients/certificates.py +++ b/eox_nelp/api_clients/certificates.py @@ -4,10 +4,16 @@ ExternalCertificatesApiClient: Class to interact with NELP external certificates service. """ from django.conf import settings -from eox_audit_model.decorators import audit_method from eox_nelp.api_clients import AbstractBasicAuthApiClient +try: + from eox_audit_model.decorators import audit_method +except ImportError: + def audit_method(func): + """Identity audit_method""" + return func + class ExternalCertificatesApiClient(AbstractBasicAuthApiClient): """Allow to perform multiple external certificates operations.""" diff --git a/requirements/base.in b/requirements/base.in index 9c1e8b23..43ffa456 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -9,7 +9,6 @@ djangorestframework-jsonapi==5.0.0 edx-drf-extensions edx-i18n-tools edx-opaque-keys -eox-audit-model eox-core eox-tenant eox-theming diff --git a/requirements/base.txt b/requirements/base.txt index 15d0fe63..2187d5d5 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -20,7 +20,6 @@ bs4==0.0.1 # via -r requirements/base.in celery==5.3.1 # via - # eox-audit-model # eox-core # event-tracking certifi==2023.7.22 @@ -45,7 +44,7 @@ click-plugins==1.1.1 # via celery click-repl==0.3.0 # via celery -cryptography==41.0.3 +cryptography==41.0.2 # via # jwcrypto # pyjwt @@ -75,7 +74,6 @@ django==3.2.20 # edx-i18n-tools # edx-proctoring # edx-when - # eox-audit-model # eox-core # eox-theming # event-tracking @@ -86,16 +84,13 @@ django-crum==0.7.9 # via # edx-django-utils # edx-proctoring - # eox-audit-model django-filter==21.1 # via # -c requirements/constraints.txt # -r requirements/base.in # eox-core django-ipware==5.0.0 - # via - # edx-proctoring - # eox-audit-model + # via edx-proctoring django-model-utils==4.3.1 # via # edx-proctoring @@ -135,7 +130,7 @@ drf-yasg==1.21.7 # via edx-api-doc-tools edx-api-doc-tools==1.7.0 # via eox-core -edx-django-utils==5.7.0 +edx-django-utils==5.6.0 # via # edx-drf-extensions # edx-rest-api-client @@ -147,7 +142,7 @@ edx-drf-extensions==8.0.0 # -r requirements/base.in # edx-proctoring # edx-when -edx-i18n-tools==1.1.0 +edx-i18n-tools==1.0.0 # via -r requirements/base.in edx-opaque-keys[django]==2.3.0 # via @@ -157,14 +152,12 @@ edx-opaque-keys[django]==2.3.0 # edx-when # eox-core # openedx-events -edx-proctoring==4.16.1 +edx-proctoring==4.16.0 # via eox-core edx-rest-api-client==5.6.0 # via edx-proctoring edx-when==2.4.0 # via edx-proctoring -eox-audit-model==2.0.0 - # via -r requirements/base.in eox-core==8.1.0 # via -r requirements/base.in eox-tenant==9.2.1 @@ -173,7 +166,7 @@ eox-tenant==9.2.1 # eox-theming eox-theming==5.0.0 # via -r requirements/base.in -event-tracking==2.2.0 +event-tracking==2.1.0 # via edx-proctoring fastavro==1.8.2 # via openedx-events @@ -188,9 +181,7 @@ inflection==0.5.1 # djangorestframework-jsonapi # drf-yasg jsonfield==3.1.0 - # via - # edx-proctoring - # eox-audit-model + # via edx-proctoring jwcrypto==1.5.0 # via django-oauth-toolkit kombu==5.3.1 @@ -324,13 +315,13 @@ vine==5.0.0 # kombu wcwidth==0.2.6 # via prompt-toolkit -web-fragments==2.1.0 +web-fragments==2.0.0 # via xblock webob==1.8.7 # via xblock wrapt==1.15.0 # via deprecated -xblock==1.7.0 +xblock==1.6.2 # via edx-when # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index def0a828..759456d5 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -10,7 +10,7 @@ click==8.1.6 # via pip-tools packaging==23.1 # via build -pip-tools==7.3.0 +pip-tools==7.1.0 # via -r requirements/pip-tools.in pyproject-hooks==1.0.0 # via build @@ -18,8 +18,7 @@ tomli==2.0.1 # via # build # pip-tools - # pyproject-hooks -wheel==0.41.1 +wheel==0.41.0 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index 4fd78dd1..441362c6 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -35,7 +35,6 @@ bs4==0.0.1 celery==5.3.1 # via # -r requirements/base.txt - # eox-audit-model # eox-core # event-tracking certifi==2023.7.22 @@ -74,7 +73,7 @@ click-repl==0.3.0 # celery coverage==7.2.7 # via -r requirements/test.in -cryptography==41.0.3 +cryptography==41.0.2 # via # -r requirements/base.txt # jwcrypto @@ -112,7 +111,6 @@ django==3.2.20 # edx-i18n-tools # edx-proctoring # edx-when - # eox-audit-model # eox-core # eox-theming # event-tracking @@ -124,7 +122,6 @@ django-crum==0.7.9 # -r requirements/base.txt # edx-django-utils # edx-proctoring - # eox-audit-model django-fake-model==0.1.4 # via -r requirements/test.in django-filter==21.1 @@ -136,7 +133,6 @@ django-ipware==5.0.0 # via # -r requirements/base.txt # edx-proctoring - # eox-audit-model django-model-utils==4.3.1 # via # -r requirements/base.txt @@ -192,7 +188,7 @@ edx-api-doc-tools==1.7.0 # via # -r requirements/base.txt # eox-core -edx-django-utils==5.7.0 +edx-django-utils==5.6.0 # via # -r requirements/base.txt # edx-drf-extensions @@ -205,7 +201,7 @@ edx-drf-extensions==8.0.0 # -r requirements/base.txt # edx-proctoring # edx-when -edx-i18n-tools==1.1.0 +edx-i18n-tools==1.0.0 # via -r requirements/base.txt edx-opaque-keys[django]==2.3.0 # via @@ -215,7 +211,7 @@ edx-opaque-keys[django]==2.3.0 # edx-when # eox-core # openedx-events -edx-proctoring==4.16.1 +edx-proctoring==4.16.0 # via # -r requirements/base.txt # eox-core @@ -227,8 +223,6 @@ edx-when==2.4.0 # via # -r requirements/base.txt # edx-proctoring -eox-audit-model==2.0.0 - # via -r requirements/base.txt eox-core==8.1.0 # via -r requirements/base.txt eox-tenant==9.2.1 @@ -237,7 +231,7 @@ eox-tenant==9.2.1 # eox-theming eox-theming==5.0.0 # via -r requirements/base.txt -event-tracking==2.2.0 +event-tracking==2.1.0 # via # -r requirements/base.txt # edx-proctoring @@ -270,7 +264,6 @@ jsonfield==3.1.0 # via # -r requirements/base.txt # edx-proctoring - # eox-audit-model jwcrypto==1.5.0 # via # -r requirements/base.txt @@ -496,7 +489,7 @@ wcwidth==0.2.6 # via # -r requirements/base.txt # prompt-toolkit -web-fragments==2.1.0 +web-fragments==2.0.0 # via # -r requirements/base.txt # xblock @@ -509,7 +502,7 @@ wrapt==1.15.0 # -r requirements/base.txt # astroid # deprecated -xblock==1.7.0 +xblock==1.6.2 # via # -r requirements/base.txt # edx-when diff --git a/requirements/tox.txt b/requirements/tox.txt index d25c37a7..408bd04e 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -6,7 +6,7 @@ # cachetools==5.3.1 # via tox -chardet==5.2.0 +chardet==5.1.0 # via tox colorama==0.4.6 # via tox @@ -32,7 +32,7 @@ tomli==2.0.1 # via # pyproject-api # tox -tox==4.7.0 +tox==4.6.4 # via -r requirements/tox.in virtualenv==20.24.2 # via tox