Merge branch 'master' of github.com:openedx/license-manager into ENT-…

…9201/define-PA-role-&-permissions
openedx · Aug 12, 2024 · b269506 · b269506
2 parents 3d526dc + 2f5936c
commit b269506
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 53 deletions.
diff --git a/license_manager/apps/api/v1/tests/test_views.py b/license_manager/apps/api/v1/tests/test_views.py
@@ -1078,7 +1078,7 @@ def test_subscription_plan_update_staff_user_403(api_client, staff_user, boolean
 
 
 @pytest.mark.django_db
-def test_subscription_plan_create_non_staff_user_201(api_client, non_staff_user, boolean_toggle):
+def test_subscription_plan_create_non_staff_user_201(api_client, non_staff_user):
     """
     Verify that the subcription update endpoint is accessible to authorised users only
     """
@@ -1379,7 +1379,6 @@ def test_subscription_plan_get_non_staff_user_failure(api_client, non_staff_user
     """
     Verify that the subscription create endpoint returns error if invalid product id is provided
     """
-    enterprise_customer_uuid = uuid4()
     invalid_subscription_id = uuid4()
 
     _assign_role_via_jwt_or_db(

diff --git a/license_manager/apps/api/v1/views.py b/license_manager/apps/api/v1/views.py
@@ -318,7 +318,7 @@ class CustomerAgreementProvisioningAdminViewset(
     """ Viewset for Provisioning Admins write operations."""
     authentication_classes = [JwtAuthentication, SessionAuthentication]
     permission_classes = [permissions.IsAuthenticated]
-    permission_required = constants.SUBSCRIPTIONS_CUSTOMER_AGREEMENT_PROVISIONING_ADMIN_ACCESS_PERMISSION 
+    permission_required = constants.SUBSCRIPTIONS_CUSTOMER_AGREEMENT_PROVISIONING_ADMIN_ACCESS_PERMISSION
     lookup_field = 'uuid'
     lookup_url_kwarg = 'customer_agreement_uuid'
     serializer_class = serializers.CustomerAgreementSerializer

diff --git a/license_manager/apps/subscriptions/constants.py b/license_manager/apps/subscriptions/constants.py
@@ -91,7 +91,8 @@ class SegmentEvents:
 
 # Provisioning admins permissions
 SUBSCRIPTIONS_PROVISIONING_ADMIN_ACCESS_PERMISSION = 'provisioning.has_subscription_admin_access'
-SUBSCRIPTIONS_CUSTOMER_AGREEMENT_PROVISIONING_ADMIN_ACCESS_PERMISSION = 'provisioning.has_customer_agreement_admin_access'
+SUBSCRIPTIONS_CUSTOMER_AGREEMENT_PROVISIONING_ADMIN_ACCESS_PERMISSION = \
+    'provisioning.has_customer_agreement_admin_access'
 
 # Subsidy constants
 PERCENTAGE_DISCOUNT_TYPE = 'percentage'

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -12,7 +12,7 @@ asgiref==3.8.1
     # via
     #   django
     #   django-cors-headers
-attrs==23.2.0
+attrs==24.1.0
     # via
     #   jsonschema
     #   referencing
@@ -22,9 +22,9 @@ backoff==1.10.0
     #   analytics-python
 billiard==4.2.0
     # via celery
-boto3==1.34.151
+boto3==1.34.153
     # via django-ses
-botocore==1.34.151
+botocore==1.34.153
     # via
     #   boto3
     #   s3transfer
@@ -108,7 +108,7 @@ django-durationwidget==1.0.5
     # via -r requirements/base.in
 django-extensions==3.2.3
     # via -r requirements/base.in
-django-filter==24.2
+django-filter==24.3
     # via -r requirements/base.in
 django-log-request-id==2.1.0
     # via -r requirements/base.in
@@ -211,7 +211,7 @@ psutil==6.0.0
     # via edx-django-utils
 pycparser==2.22
     # via cffi
-pyjwt[crypto]==2.8.0
+pyjwt[crypto]==2.9.0
     # via
     #   drf-jwt
     #   edx-auth-backends

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -20,7 +20,7 @@ astroid==3.2.4
     #   -r requirements/validation.txt
     #   pylint
     #   pylint-celery
-attrs==23.2.0
+attrs==24.1.0
     # via
     #   -r requirements/validation.txt
     #   jsonschema
@@ -33,11 +33,11 @@ billiard==4.2.0
     # via
     #   -r requirements/validation.txt
     #   celery
-boto3==1.34.151
+boto3==1.34.153
     # via
     #   -r requirements/validation.txt
     #   django-ses
-botocore==1.34.151
+botocore==1.34.153
     # via
     #   -r requirements/validation.txt
     #   boto3
@@ -98,7 +98,7 @@ code-annotations==1.8.0
     #   -r requirements/validation.txt
     #   edx-lint
     #   edx-toggles
-coverage[toml]==7.6.0
+coverage[toml]==7.6.1
     # via
     #   -r requirements/validation.txt
     #   pytest-cov
@@ -176,7 +176,7 @@ django-extensions==3.2.3
     # via
     #   -r requirements/dev.in
     #   -r requirements/validation.txt
-django-filter==24.2
+django-filter==24.3
     # via -r requirements/validation.txt
 django-log-request-id==2.1.0
     # via -r requirements/validation.txt
@@ -251,7 +251,7 @@ edx-toggles==5.2.0
     # via -r requirements/validation.txt
 factory-boy==3.3.0
     # via -r requirements/validation.txt
-faker==26.0.0
+faker==26.1.0
     # via
     #   -r requirements/validation.txt
     #   factory-boy
@@ -382,7 +382,7 @@ psutil==6.0.0
     # via
     #   -r requirements/validation.txt
     #   edx-django-utils
-pycodestyle==2.12.0
+pycodestyle==2.12.1
     # via -r requirements/validation.txt
 pycparser==2.22
     # via
@@ -392,7 +392,7 @@ pydocstyle==6.3.0
     # via -r requirements/validation.txt
 pygments==2.18.0
     # via diff-cover
-pyjwt[crypto]==2.8.0
+pyjwt[crypto]==2.9.0
     # via
     #   -r requirements/validation.txt
     #   drf-jwt
@@ -582,7 +582,7 @@ wcwidth==0.2.13
     # via
     #   -r requirements/validation.txt
     #   prompt-toolkit
-wheel==0.43.0
+wheel==0.44.0
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -24,7 +24,7 @@ astroid==3.2.4
     #   -r requirements/test.txt
     #   pylint
     #   pylint-celery
-attrs==23.2.0
+attrs==24.1.0
     # via
     #   -r requirements/test.txt
     #   jsonschema
@@ -43,11 +43,11 @@ billiard==4.2.0
     # via
     #   -r requirements/test.txt
     #   celery
-boto3==1.34.151
+boto3==1.34.153
     # via
     #   -r requirements/test.txt
     #   django-ses
-botocore==1.34.151
+botocore==1.34.153
     # via
     #   -r requirements/test.txt
     #   boto3
@@ -102,7 +102,7 @@ code-annotations==1.8.0
     #   -r requirements/test.txt
     #   edx-lint
     #   edx-toggles
-coverage[toml]==7.6.0
+coverage[toml]==7.6.1
     # via
     #   -r requirements/test.txt
     #   pytest-cov
@@ -168,7 +168,7 @@ django-dynamic-fixture==4.0.1
     # via -r requirements/test.txt
 django-extensions==3.2.3
     # via -r requirements/test.txt
-django-filter==24.2
+django-filter==24.3
     # via -r requirements/test.txt
 django-log-request-id==2.1.0
     # via -r requirements/test.txt
@@ -250,7 +250,7 @@ edx-toggles==5.2.0
     # via -r requirements/test.txt
 factory-boy==3.3.0
     # via -r requirements/test.txt
-faker==26.0.0
+faker==26.1.0
     # via
     #   -r requirements/test.txt
     #   factory-boy
@@ -368,7 +368,7 @@ pygments==2.18.0
     #   pydata-sphinx-theme
     #   readme-renderer
     #   sphinx
-pyjwt[crypto]==2.8.0
+pyjwt[crypto]==2.9.0
     # via
     #   -r requirements/test.txt
     #   drf-jwt

diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
@@ -16,7 +16,7 @@ pyproject-hooks==1.1.0
     # via
     #   build
     #   pip-tools
-wheel==0.43.0
+wheel==0.44.0
     # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:

diff --git a/requirements/pip.txt b/requirements/pip.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-wheel==0.43.0
+wheel==0.44.0
     # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:

diff --git a/requirements/production.txt b/requirements/production.txt
@@ -15,7 +15,7 @@ asgiref==3.8.1
     #   -r requirements/base.txt
     #   django
     #   django-cors-headers
-attrs==23.2.0
+attrs==24.1.0
     # via
     #   -r requirements/base.txt
     #   jsonschema
@@ -28,11 +28,11 @@ billiard==4.2.0
     # via
     #   -r requirements/base.txt
     #   celery
-boto3==1.34.151
+boto3==1.34.153
     # via
     #   -r requirements/base.txt
     #   django-ses
-botocore==1.34.151
+botocore==1.34.153
     # via
     #   -r requirements/base.txt
     #   boto3
@@ -134,7 +134,7 @@ django-durationwidget==1.0.5
     # via -r requirements/base.txt
 django-extensions==3.2.3
     # via -r requirements/base.txt
-django-filter==24.2
+django-filter==24.3
     # via -r requirements/base.txt
 django-log-request-id==2.1.0
     # via -r requirements/base.txt
@@ -283,7 +283,7 @@ pycparser==2.22
     # via
     #   -r requirements/base.txt
     #   cffi
-pyjwt[crypto]==2.8.0
+pyjwt[crypto]==2.9.0
     # via
     #   -r requirements/base.txt
     #   drf-jwt

diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -19,7 +19,7 @@ astroid==3.2.4
     # via
     #   pylint
     #   pylint-celery
-attrs==23.2.0
+attrs==24.1.0
     # via
     #   -r requirements/base.txt
     #   jsonschema
@@ -32,11 +32,11 @@ billiard==4.2.0
     # via
     #   -r requirements/base.txt
     #   celery
-boto3==1.34.151
+boto3==1.34.153
     # via
     #   -r requirements/base.txt
     #   django-ses
-botocore==1.34.151
+botocore==1.34.153
     # via
     #   -r requirements/base.txt
     #   boto3
@@ -145,7 +145,7 @@ django-durationwidget==1.0.5
     # via -r requirements/base.txt
 django-extensions==3.2.3
     # via -r requirements/base.txt
-django-filter==24.2
+django-filter==24.3
     # via -r requirements/base.txt
 django-log-request-id==2.1.0
     # via -r requirements/base.txt
@@ -292,15 +292,15 @@ psutil==6.0.0
     # via
     #   -r requirements/base.txt
     #   edx-django-utils
-pycodestyle==2.12.0
+pycodestyle==2.12.1
     # via -r requirements/quality.in
 pycparser==2.22
     # via
     #   -r requirements/base.txt
     #   cffi
 pydocstyle==6.3.0
     # via -r requirements/quality.in
-pyjwt[crypto]==2.8.0
+pyjwt[crypto]==2.9.0
     # via
     #   -r requirements/base.txt
     #   drf-jwt

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -19,7 +19,7 @@ astroid==3.2.4
     # via
     #   pylint
     #   pylint-celery
-attrs==23.2.0
+attrs==24.1.0
     # via
     #   -r requirements/base.txt
     #   jsonschema
@@ -32,11 +32,11 @@ billiard==4.2.0
     # via
     #   -r requirements/base.txt
     #   celery
-boto3==1.34.151
+boto3==1.34.153
     # via
     #   -r requirements/base.txt
     #   django-ses
-botocore==1.34.151
+botocore==1.34.153
     # via
     #   -r requirements/base.txt
     #   boto3
@@ -90,7 +90,7 @@ code-annotations==1.8.0
     #   -r requirements/test.in
     #   edx-lint
     #   edx-toggles
-coverage[toml]==7.6.0
+coverage[toml]==7.6.1
     # via
     #   -r requirements/test.in
     #   pytest-cov
@@ -154,7 +154,7 @@ django-dynamic-fixture==4.0.1
     # via -r requirements/test.in
 django-extensions==3.2.3
     # via -r requirements/base.txt
-django-filter==24.2
+django-filter==24.3
     # via -r requirements/base.txt
 django-log-request-id==2.1.0
     # via -r requirements/base.txt
@@ -227,7 +227,7 @@ edx-toggles==5.2.0
     # via -r requirements/base.txt
 factory-boy==3.3.0
     # via -r requirements/test.in
-faker==26.0.0
+faker==26.1.0
     # via factory-boy
 freezegun==1.5.1
     # via -r requirements/test.in
@@ -315,7 +315,7 @@ pycparser==2.22
     # via
     #   -r requirements/base.txt
     #   cffi
-pyjwt[crypto]==2.8.0
+pyjwt[crypto]==2.9.0
     # via
     #   -r requirements/base.txt
     #   drf-jwt