Merge branch 'master' into bilalqamar95/dockerfile-setup-removal

license_manager/apps/api/v1/tests/test_license_activation_view.py

@@ -152,6 +152,7 @@ def test_activate_an_assigned_license(self, mock_send_post_activation_email_task
         assert activated_license['status'] == constants.ACTIVATED
         expected_activation_date = self.now.strftime('%Y-%m-%dT%H:%M:%S.%fZ')
         assert activated_license['activation_date'] == expected_activation_date
+        assert activated_license['subscription_plan']['uuid'] == str(license_to_be_activated.subscription_plan.uuid)
 
         # Refresh license from the database
         license_to_be_activated.refresh_from_db()

license_manager/apps/api/v1/views.py

@@ -1801,7 +1801,7 @@ def post(self, request):
 
         # There's an implied logical branch where the license is already activated
         # in which case we also return as if the activation action was successful.
-        serialized_license = serializers.LicenseSerializer(user_license)
+        serialized_license = serializers.LearnerLicenseSerializer(user_license)
         return Response(serialized_license.data, status=status.HTTP_200_OK)
 
     def _track_and_notify(self, user_license):

requirements/base.txt

@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-amqp==5.2.0
+amqp==5.3.1
     # via kombu
 analytics-python==1.4.post1
     # via -r requirements/base.in
@@ -24,9 +24,9 @@ billiard==4.2.1
     # via celery
 bleach[css]==6.2.0
     # via -r requirements/base.in
-boto3==1.35.54
+boto3==1.35.63
     # via django-ses
-botocore==1.35.54
+botocore==1.35.63
     # via
     #   boto3
     #   s3transfer
@@ -57,7 +57,7 @@ click-plugins==1.1.1
     # via celery
 click-repl==0.3.0
     # via celery
-code-annotations==1.8.0
+code-annotations==1.8.1
     # via edx-toggles
 cryptography==43.0.3
     # via
@@ -123,7 +123,7 @@ django-ses==4.2.0
     # via -r requirements/base.in
 django-simple-history==3.7.0
     # via -r requirements/base.in
-django-waffle==4.1.0
+django-waffle==4.2.0
     # via
     #   -r requirements/base.in
     #   edx-django-utils
@@ -196,7 +196,7 @@ markupsafe==3.0.2
     # via jinja2
 monotonic==1.6
     # via analytics-python
-mysqlclient==2.2.5
+mysqlclient==2.2.6
     # via -r requirements/base.in
 newrelic==10.2.0
     # via edx-django-utils
@@ -214,7 +214,7 @@ psutil==6.1.0
     # via edx-django-utils
 pycparser==2.22
     # via cffi
-pyjwt[crypto]==2.9.0
+pyjwt[crypto]==2.10.0
     # via
     #   drf-jwt
     #   edx-auth-backends
@@ -255,7 +255,7 @@ requests==2.32.3
     #   social-auth-core
 requests-oauthlib==2.0.0
     # via social-auth-core
-rpds-py==0.20.1
+rpds-py==0.21.0
     # via
     #   jsonschema
     #   referencing
@@ -279,7 +279,7 @@ social-auth-core==4.5.4
     # via
     #   edx-auth-backends
     #   social-auth-app-django
-sqlparse==0.5.1
+sqlparse==0.5.2
     # via django
 stevedore==5.3.0
     # via
@@ -313,7 +313,7 @@ webencodings==0.5.1
     # via
     #   bleach
     #   tinycss2
-zipp==3.20.2
+zipp==3.21.0
     # via -r requirements/base.in
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/common_constraints.txt

@@ -16,7 +16,6 @@
 # Note: Changes to this file will automatically be used by other repos, referencing
 #  this file from Github directly. It does not require packaging in edx-lint.
 
-
 # using LTS django version
 Django<5.0
 
@@ -28,13 +27,6 @@ elasticsearch<7.14.0
 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
 
 
-# Cause: https://github.com/openedx/event-tracking/pull/290
-# event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform.
-# We will pin event-tracking to do not break existing installations
-# This can be unpinned once https://github.com/openedx/edx-platform/issues/34586
-# has been resolved and edx-platform is running with pymongo>=4.4.0
-event-tracking<2.4.1
-
 # Cause: https://github.com/openedx/edx-lint/issues/458
 # This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved.
 pip<24.3

requirements/dev.txt

@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-amqp==5.2.0
+amqp==5.3.1
     # via
     #   -r requirements/validation.txt
     #   kombu
@@ -35,11 +35,11 @@ billiard==4.2.1
     #   celery
 bleach[css]==6.2.0
     # via -r requirements/validation.txt
-boto3==1.35.54
+boto3==1.35.63
     # via
     #   -r requirements/validation.txt
     #   django-ses
-botocore==1.35.54
+botocore==1.35.63
     # via
     #   -r requirements/validation.txt
     #   boto3
@@ -95,12 +95,12 @@ click-repl==0.3.0
     # via
     #   -r requirements/validation.txt
     #   celery
-code-annotations==1.8.0
+code-annotations==1.8.1
     # via
     #   -r requirements/validation.txt
     #   edx-lint
     #   edx-toggles
-coverage[toml]==7.6.4
+coverage[toml]==7.6.7
     # via
     #   -r requirements/validation.txt
     #   pytest-cov
@@ -191,7 +191,7 @@ django-ses==4.2.0
     # via -r requirements/validation.txt
 django-simple-history==3.7.0
     # via -r requirements/validation.txt
-django-waffle==4.1.0
+django-waffle==4.2.0
     # via
     #   -r requirements/validation.txt
     #   edx-django-utils
@@ -254,7 +254,7 @@ edx-toggles==5.2.0
     # via -r requirements/validation.txt
 factory-boy==3.3.1
     # via -r requirements/validation.txt
-faker==30.8.2
+faker==33.0.0
     # via
     #   -r requirements/validation.txt
     #   factory-boy
@@ -316,7 +316,7 @@ lxml[html-clean]==5.3.0
     #   -r requirements/validation.txt
     #   edx-i18n-tools
     #   lxml-html-clean
-lxml-html-clean==0.3.1
+lxml-html-clean==0.4.1
     # via
     #   -r requirements/validation.txt
     #   lxml
@@ -334,7 +334,7 @@ monotonic==1.6
     #   analytics-python
 more-itertools==10.5.0
     # via inflect
-mysqlclient==2.2.5
+mysqlclient==2.2.6
     # via -r requirements/validation.txt
 newrelic==10.2.0
     # via
@@ -345,7 +345,7 @@ oauthlib==3.2.2
     #   -r requirements/validation.txt
     #   requests-oauthlib
     #   social-auth-core
-packaging==24.1
+packaging==24.2
     # via
     #   -r requirements/pip-tools.txt
     #   -r requirements/validation.txt
@@ -400,7 +400,7 @@ pydocstyle==6.3.0
     # via -r requirements/validation.txt
 pygments==2.18.0
     # via diff-cover
-pyjwt[crypto]==2.9.0
+pyjwt[crypto]==2.10.0
     # via
     #   -r requirements/validation.txt
     #   drf-jwt
@@ -495,7 +495,7 @@ requests-oauthlib==2.0.0
     # via
     #   -r requirements/validation.txt
     #   social-auth-core
-rpds-py==0.20.1
+rpds-py==0.21.0
     # via
     #   -r requirements/validation.txt
     #   jsonschema
@@ -534,7 +534,7 @@ social-auth-core==4.5.4
     #   -r requirements/validation.txt
     #   edx-auth-backends
     #   social-auth-app-django
-sqlparse==0.5.1
+sqlparse==0.5.2
     # via
     #   -r requirements/validation.txt
     #   django
@@ -594,11 +594,11 @@ webencodings==0.5.1
     #   -r requirements/validation.txt
     #   bleach
     #   tinycss2
-wheel==0.44.0
+wheel==0.45.0
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
-zipp==3.20.2
+zipp==3.21.0
     # via -r requirements/validation.txt
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/doc.txt

@@ -8,7 +8,7 @@ accessible-pygments==0.0.5
     # via pydata-sphinx-theme
 alabaster==1.0.0
     # via sphinx
-amqp==5.2.0
+amqp==5.3.1
     # via
     #   -r requirements/test.txt
     #   kombu
@@ -45,11 +45,11 @@ billiard==4.2.1
     #   celery
 bleach[css]==6.2.0
     # via -r requirements/test.txt
-boto3==1.35.54
+boto3==1.35.63
     # via
     #   -r requirements/test.txt
     #   django-ses
-botocore==1.35.54
+botocore==1.35.63
     # via
     #   -r requirements/test.txt
     #   boto3
@@ -99,12 +99,12 @@ click-repl==0.3.0
     # via
     #   -r requirements/test.txt
     #   celery
-code-annotations==1.8.0
+code-annotations==1.8.1
     # via
     #   -r requirements/test.txt
     #   edx-lint
     #   edx-toggles
-coverage[toml]==7.6.4
+coverage[toml]==7.6.7
     # via
     #   -r requirements/test.txt
     #   pytest-cov
@@ -183,7 +183,7 @@ django-ses==4.2.0
     # via -r requirements/test.txt
 django-simple-history==3.7.0
     # via -r requirements/test.txt
-django-waffle==4.1.0
+django-waffle==4.2.0
     # via
     #   -r requirements/test.txt
     #   edx-django-utils
@@ -253,7 +253,7 @@ edx-toggles==5.2.0
     # via -r requirements/test.txt
 factory-boy==3.3.1
     # via -r requirements/test.txt
-faker==30.8.2
+faker==33.0.0
     # via
     #   -r requirements/test.txt
     #   factory-boy
@@ -315,7 +315,7 @@ monotonic==1.6
     # via
     #   -r requirements/test.txt
     #   analytics-python
-mysqlclient==2.2.5
+mysqlclient==2.2.6
     # via -r requirements/test.txt
 newrelic==10.2.0
     # via
@@ -328,7 +328,7 @@ oauthlib==3.2.2
     #   -r requirements/test.txt
     #   requests-oauthlib
     #   social-auth-core
-packaging==24.1
+packaging==24.2
     # via
     #   -r requirements/test.txt
     #   pytest
@@ -370,7 +370,7 @@ pygments==2.18.0
     #   pydata-sphinx-theme
     #   readme-renderer
     #   sphinx
-pyjwt[crypto]==2.9.0
+pyjwt[crypto]==2.10.0
     # via
     #   -r requirements/test.txt
     #   drf-jwt
@@ -462,7 +462,7 @@ requests-oauthlib==2.0.0
     #   social-auth-core
 restructuredtext-lint==1.4.0
     # via doc8
-rpds-py==0.20.1
+rpds-py==0.21.0
     # via
     #   -r requirements/test.txt
     #   jsonschema
@@ -519,7 +519,7 @@ sphinxcontrib-qthelp==2.0.0
     # via sphinx
 sphinxcontrib-serializinghtml==2.0.0
     # via sphinx
-sqlparse==0.5.1
+sqlparse==0.5.2
     # via
     #   -r requirements/test.txt
     #   django
@@ -577,7 +577,7 @@ webencodings==0.5.1
     #   -r requirements/test.txt
     #   bleach
     #   tinycss2
-zipp==3.20.2
+zipp==3.21.0
     # via -r requirements/test.txt
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/pip-tools.txt

@@ -8,15 +8,15 @@ build==1.2.2.post1
     # via pip-tools
 click==8.1.7
     # via pip-tools
-packaging==24.1
+packaging==24.2
     # via build
 pip-tools==7.4.1
     # via -r requirements/pip-tools.in
 pyproject-hooks==1.2.0
     # via
     #   build
     #   pip-tools
-wheel==0.44.0
+wheel==0.45.0
     # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/pip.txt

@@ -4,13 +4,13 @@
 #
 #    make upgrade
 #
-wheel==0.44.0
+wheel==0.45.0
     # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
 pip==24.2
     # via
-    #   -c requirements/common_constraints.txt
+    #   -c /home/runner/work/license-manager/license-manager/requirements/common_constraints.txt
     #   -r requirements/pip.in
-setuptools==75.3.0
+setuptools==75.5.0
     # via -r requirements/pip.in