edx-enterprise-data 10.4.0__tar.gz → 10.5.1__tar.gz

{edx_enterprise_data-10.4.0 → edx_enterprise_data-10.5.1}/CHANGELOG.rst

@@ -16,6 +16,15 @@ Unreleased
 
 =========================
 
+[10.5.1] - 2024-11-14
+---------------------
+  * chore: upgrade python requirements
+
+[10.5.0] - 2024-11-14
+---------------------
+  * Fix CSV file names
+  * Fix ordering of skills charts data
+
 [10.4.0] - 2024-11-14
 ---------------------
   * Updated text for null emails record of leaderboard.
@@ -35,8 +44,8 @@ Unreleased
 
 [10.0.1] - 2024-10-25
 ---------------------
-  * Same as ``10.0.0`` 
-  * Bumping the version so a new tag can be created in the GitHub 
+  * Same as ``10.0.0``
+  * Bumping the version so a new tag can be created in the GitHub
 
 [10.0.0] - 2024-10-25
 ---------------------

{edx_enterprise_data-10.4.0/edx_enterprise_data.egg-info → edx_enterprise_data-10.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edx-enterprise-data
-Version: 10.4.0
+Version: 10.5.1
 Summary: Enterprise Reporting
 Home-page: https://github.com/openedx/edx-enterprise-data
 Author: edX

{edx_enterprise_data-10.4.0 → edx_enterprise_data-10.5.1/edx_enterprise_data.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edx-enterprise-data
-Version: 10.4.0
+Version: 10.5.1
 Summary: Enterprise Reporting
 Home-page: https://github.com/openedx/edx-enterprise-data
 Author: edX

{edx_enterprise_data-10.4.0 → edx_enterprise_data-10.5.1}/enterprise_data/__init__.py

@@ -2,4 +2,4 @@
 Enterprise data api application. This Django app exposes API endpoints used by enterprises.
 """
 
-__version__ = "10.4.0"
+__version__ = "10.5.1"

{edx_enterprise_data-10.4.0 → edx_enterprise_data-10.5.1}/enterprise_data/admin_analytics/database/queries/skills_daily_rollup_admin_dash.py

@@ -38,7 +38,8 @@ class SkillsDailyRollupAdminDashQueries:
             WITH TopSkills AS (
                 -- Get top 10 skills by total enrollments
                 SELECT
-                    skill_name
+                    skill_name,
+                    SUM(enrolls) AS total_enrollment_count
                 FROM
                     skills_daily_rollup_admin_dash
                 WHERE
@@ -47,7 +48,7 @@ class SkillsDailyRollupAdminDashQueries:
                 GROUP BY
                     skill_name
                 ORDER BY
-                    SUM(enrolls) DESC
+                    total_enrollment_count DESC
                 LIMIT 10
             )
             SELECT
@@ -70,7 +71,7 @@ class SkillsDailyRollupAdminDashQueries:
             GROUP BY
                 sd.skill_name, subject_name
             ORDER BY
-                subject_name;
+                total_enrollment_count DESC;
         """
 
     @staticmethod
@@ -82,7 +83,8 @@ class SkillsDailyRollupAdminDashQueries:
             WITH TopSkills AS (
                 -- Get top 10 skills by total completions
                 SELECT
-                    skill_name
+                    skill_name,
+                    SUM(completions) AS total_completion_count
                 FROM
                     skills_daily_rollup_admin_dash
                 WHERE
@@ -91,7 +93,7 @@ class SkillsDailyRollupAdminDashQueries:
                 GROUP BY
                     skill_name
                 ORDER BY
-                    SUM(completions) DESC
+                    total_completion_count DESC
                 LIMIT 10
             )
             SELECT
@@ -114,5 +116,5 @@ class SkillsDailyRollupAdminDashQueries:
             GROUP BY
                 sd.skill_name, subject_name
             ORDER BY
-                subject_name;
+                total_completion_count DESC;
         """

{edx_enterprise_data-10.4.0 → edx_enterprise_data-10.5.1}/enterprise_data/api/v1/views/analytics_completions.py

@@ -75,7 +75,7 @@ class AdvanceAnalyticsCompletionsView(AnalyticsPaginationMixin, ViewSet):
         )
 
         if response_type == ResponseType.CSV.value:
-            filename = f"""individual_completions, {start_date} - {end_date}.csv"""
+            filename = f"""Individual Completions, {start_date} - {end_date}.csv"""
 
             return StreamingHttpResponse(
                 IndividualCompletionsCSVRenderer().render(self._stream_serialized_data(

{edx_enterprise_data-10.4.0 → edx_enterprise_data-10.5.1}/enterprise_data/api/v1/views/analytics_engagements.py

@@ -75,7 +75,7 @@ class AdvanceAnalyticsEngagementView(AnalyticsPaginationMixin, ViewSet):
         )
 
         if response_type == ResponseType.CSV.value:
-            filename = f"""individual_engagements, {start_date} - {end_date}.csv"""
+            filename = f"""Individual Engagements, {start_date} - {end_date}.csv"""
 
             return StreamingHttpResponse(
                 IndividualEngagementsCSVRenderer().render(self._stream_serialized_data(

{edx_enterprise_data-10.4.0 → edx_enterprise_data-10.5.1}/enterprise_data/api/v1/views/analytics_enrollments.py

@@ -74,7 +74,7 @@ class AdvanceAnalyticsEnrollmentsView(AnalyticsPaginationMixin, ViewSet):
         )
 
         if response_type == ResponseType.CSV.value:
-            filename = f"""individual_enrollments, {start_date} - {end_date}.csv"""
+            filename = f"""Individual Enrollments, {start_date} - {end_date}.csv"""
 
             return StreamingHttpResponse(
                 IndividualEnrollmentsCSVRenderer().render(self._stream_serialized_data(

{edx_enterprise_data-10.4.0 → edx_enterprise_data-10.5.1}/requirements/base.txt

@@ -4,21 +4,21 @@
 #
 #    make upgrade
 #
-amqp==5.2.0
+amqp==5.3.1
     # via kombu
 asgiref==3.8.1
     # via django
 asn1crypto==1.5.1
     # via snowflake-connector-python
-awscli==1.35.20
+awscli==1.36.4
     # via -r requirements/reporting.in
 bcrypt==4.2.0
     # via paramiko
 billiard==4.2.1
     # via celery
-boto3==1.35.54
+boto3==1.35.63
     # via -r requirements/reporting.in
-botocore==1.35.54
+botocore==1.35.63
     # via
     #   awscli
     #   boto3
@@ -65,7 +65,7 @@ cryptography==43.0.3
     #   snowflake-connector-python
 django==4.2.16
     # via
-    #   -c requirements/common_constraints.txt
+    #   -c /home/runner/work/edx-enterprise-data/edx-enterprise-data/requirements/common_constraints.txt
     #   -r requirements/base.in
     #   django-crum
     #   django-fernet-fields-v2
@@ -89,7 +89,7 @@ django-model-utils==5.0.0
     # via
     #   -r requirements/base.in
     #   edx-rbac
-django-waffle==4.1.0
+django-waffle==4.2.0
     # via
     #   edx-django-utils
     #   edx-drf-extensions
@@ -125,7 +125,7 @@ edx-rest-api-client==6.0.0
     # via -r requirements/base.in
 factory-boy==3.3.1
     # via -r requirements/base.in
-faker==30.8.2
+faker==33.0.0
     # via factory-boy
 filelock==3.16.1
     # via snowflake-connector-python
@@ -151,7 +151,7 @@ numpy==2.1.3
     # via
     #   -r requirements/base.in
     #   pandas
-packaging==24.1
+packaging==24.2
     # via
     #   py2neo
     #   snowflake-connector-python
@@ -183,7 +183,7 @@ pycparser==2.22
     # via cffi
 pygments==2.18.0
     # via py2neo
-pyjwt[crypto]==2.9.0
+pyjwt[crypto]==2.10.0
     # via
     #   drf-jwt
     #   edx-drf-extensions
@@ -240,7 +240,7 @@ snowflake-connector-python==3.12.3
     # via -r requirements/reporting.in
 sortedcontainers==2.4.0
     # via snowflake-connector-python
-sqlparse==0.5.1
+sqlparse==0.5.2
     # via django
 stevedore==5.3.0
     # via

{edx_enterprise_data-10.4.0 → edx_enterprise_data-10.5.1}/requirements/ci.txt

@@ -10,7 +10,7 @@ chardet==5.2.0
     # via tox
 colorama==0.4.6
     # via tox
-coverage==7.6.4
+coverage==7.6.7
     # via -r requirements/ci.in
 distlib==0.3.9
     # via virtualenv
@@ -18,7 +18,7 @@ filelock==3.16.1
     # via
     #   tox
     #   virtualenv
-packaging==24.1
+packaging==24.2
     # via
     #   pyproject-api
     #   tox

{edx_enterprise_data-10.4.0 → edx_enterprise_data-10.5.1}/requirements/common_constraints.txt

@@ -12,7 +12,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
 
@@ -24,13 +23,6 @@ elasticsearch<7.14.0
 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
 django-simple-history==3.0.0
 
-# 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

{edx_enterprise_data-10.4.0 → edx_enterprise_data-10.5.1}/requirements/dev.txt

@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-amqp==5.2.0
+amqp==5.3.1
     # via kombu
 asgiref==3.8.1
     # via django
@@ -14,15 +14,15 @@ astroid==3.3.5
     # via
     #   pylint
     #   pylint-celery
-awscli==1.35.20
+awscli==1.36.4
     # via -r requirements/reporting.in
 bcrypt==4.2.0
     # via paramiko
 billiard==4.2.1
     # via celery
-boto3==1.35.54
+boto3==1.35.63
     # via -r requirements/reporting.in
-botocore==1.35.54
+botocore==1.35.63
     # via
     #   awscli
     #   boto3
@@ -70,7 +70,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-lint
 colorama==0.4.6
     # via
@@ -94,7 +94,7 @@ distlib==0.3.9
     # via virtualenv
 django==4.2.16
     # via
-    #   -c requirements/common_constraints.txt
+    #   -c /home/runner/work/edx-enterprise-data/edx-enterprise-data/requirements/common_constraints.txt
     #   -r requirements/base.in
     #   django-crum
     #   django-fernet-fields-v2
@@ -119,7 +119,7 @@ django-model-utils==5.0.0
     # via
     #   -r requirements/base.in
     #   edx-rbac
-django-waffle==4.1.0
+django-waffle==4.2.0
     # via
     #   edx-django-utils
     #   edx-drf-extensions
@@ -163,7 +163,7 @@ edx-rest-api-client==6.0.0
     # via -r requirements/base.in
 factory-boy==3.3.1
     # via -r requirements/base.in
-faker==30.8.2
+faker==33.0.0
     # via factory-boy
 filelock==3.16.1
     # via
@@ -208,7 +208,7 @@ lxml[html-clean,html_clean]==5.3.0
     # via
     #   edx-i18n-tools
     #   lxml-html-clean
-lxml-html-clean==0.3.1
+lxml-html-clean==0.4.1
     # via lxml
 markdown-it-py==3.0.0
     # via rich
@@ -234,7 +234,7 @@ numpy==2.1.3
     # via
     #   -r requirements/base.in
     #   pandas
-packaging==24.1
+packaging==24.2
     # via
     #   build
     #   py2neo
@@ -293,7 +293,7 @@ pygments==2.18.0
     #   py2neo
     #   readme-renderer
     #   rich
-pyjwt[crypto]==2.9.0
+pyjwt[crypto]==2.10.0
     # via
     #   drf-jwt
     #   edx-drf-extensions
@@ -390,7 +390,7 @@ snowflake-connector-python==3.12.3
     # via -r requirements/reporting.in
 sortedcontainers==2.4.0
     # via snowflake-connector-python
-sqlparse==0.5.1
+sqlparse==0.5.2
     # via django
 stevedore==5.3.0
     # via
@@ -438,11 +438,11 @@ virtualenv==20.27.1
     # via tox
 wcwidth==0.2.13
     # via prompt-toolkit
-wheel==0.44.0
+wheel==0.45.0
     # via
     #   -r requirements/dev-enterprise_data.in
     #   pip-tools
-zipp==3.20.2
+zipp==3.21.0
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

{edx_enterprise_data-10.4.0 → edx_enterprise_data-10.5.1}/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/edx-enterprise-data/edx-enterprise-data/requirements/common_constraints.txt
     #   -r requirements/pip.in
-setuptools==75.3.0
+setuptools==75.5.0
     # via -r requirements/pip.in

{edx_enterprise_data-10.4.0 → edx_enterprise_data-10.5.1}/requirements/pip_tools.txt

@@ -8,7 +8,7 @@ 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
@@ -16,7 +16,7 @@ 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:

{edx_enterprise_data-10.4.0 → edx_enterprise_data-10.5.1}/requirements/quality.txt

@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-amqp==5.2.0
+amqp==5.3.1
     # via kombu
 asgiref==3.8.1
     # via django
@@ -14,15 +14,15 @@ astroid==3.3.5
     # via
     #   pylint
     #   pylint-celery
-awscli==1.35.20
+awscli==1.36.4
     # via -r requirements/reporting.in
 bcrypt==4.2.0
     # via paramiko
 billiard==4.2.1
     # via celery
-boto3==1.35.54
+boto3==1.35.63
     # via -r requirements/reporting.in
-botocore==1.35.54
+botocore==1.35.63
     # via
     #   awscli
     #   boto3
@@ -70,13 +70,13 @@ 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-lint
 colorama==0.4.6
     # via
     #   awscli
     #   tox
-coverage[toml]==7.6.4
+coverage[toml]==7.6.7
     # via pytest-cov
 cryptography==43.0.3
     # via
@@ -98,7 +98,7 @@ distlib==0.3.9
     # via virtualenv
 django==4.2.16
     # via
-    #   -c requirements/common_constraints.txt
+    #   -c /home/runner/work/edx-enterprise-data/edx-enterprise-data/requirements/common_constraints.txt
     #   -r requirements/base.in
     #   django-crum
     #   django-fernet-fields-v2
@@ -124,7 +124,7 @@ django-model-utils==5.0.0
     #   -r requirements/base.in
     #   -r requirements/test.in
     #   edx-rbac
-django-waffle==4.1.0
+django-waffle==4.2.0
     # via
     #   edx-django-utils
     #   edx-drf-extensions
@@ -170,7 +170,7 @@ factory-boy==3.3.1
     # via
     #   -r requirements/base.in
     #   -r requirements/test.in
-faker==30.8.2
+faker==33.0.0
     # via factory-boy
 filelock==3.16.1
     # via
@@ -221,7 +221,7 @@ lxml[html-clean,html_clean]==5.3.0
     # via
     #   edx-i18n-tools
     #   lxml-html-clean
-lxml-html-clean==0.3.1
+lxml-html-clean==0.4.1
     # via lxml
 markdown-it-py==3.0.0
     # via rich
@@ -249,7 +249,7 @@ numpy==2.1.3
     # via
     #   -r requirements/base.in
     #   pandas
-packaging==24.1
+packaging==24.2
     # via
     #   build
     #   py2neo
@@ -310,7 +310,7 @@ pygments==2.18.0
     #   py2neo
     #   readme-renderer
     #   rich
-pyjwt[crypto]==2.9.0
+pyjwt[crypto]==2.10.0
     # via
     #   drf-jwt
     #   edx-drf-extensions
@@ -420,7 +420,7 @@ snowflake-connector-python==3.12.3
     # via -r requirements/reporting.in
 sortedcontainers==2.4.0
     # via snowflake-connector-python
-sqlparse==0.5.1
+sqlparse==0.5.2
     # via django
 stevedore==5.3.0
     # via
@@ -471,11 +471,11 @@ virtualenv==20.27.1
     # via tox
 wcwidth==0.2.13
     # via prompt-toolkit
-wheel==0.44.0
+wheel==0.45.0
     # via
     #   -r requirements/dev-enterprise_data.in
     #   pip-tools
-zipp==3.20.2
+zipp==3.21.0
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

{edx_enterprise_data-10.4.0 → edx_enterprise_data-10.5.1}/requirements/test-master.txt

@@ -4,21 +4,21 @@
 #
 #    make upgrade
 #
-amqp==5.2.0
+amqp==5.3.1
     # via kombu
 asgiref==3.8.1
     # via django
 asn1crypto==1.5.1
     # via snowflake-connector-python
-awscli==1.35.20
+awscli==1.36.4
     # via -r requirements/reporting.in
 bcrypt==4.2.0
     # via paramiko
 billiard==4.2.1
     # via celery
-boto3==1.35.54
+boto3==1.35.63
     # via -r requirements/reporting.in
-botocore==1.35.54
+botocore==1.35.63
     # via
     #   awscli
     #   boto3
@@ -54,7 +54,7 @@ click-repl==0.3.0
     # via celery
 colorama==0.4.6
     # via awscli
-coverage[toml]==7.6.4
+coverage[toml]==7.6.7
     # via pytest-cov
 cryptography==43.0.3
     # via
@@ -68,7 +68,7 @@ cryptography==43.0.3
 ddt==1.7.2
     # via -r requirements/test.in
     # via
-    #   -c requirements/common_constraints.txt
+    #   -c /home/runner/work/edx-enterprise-data/edx-enterprise-data/requirements/common_constraints.txt
     #   -r requirements/base.in
     #   -r requirements/test-master.in
     #   django-crum
@@ -94,7 +94,7 @@ django-model-utils==5.0.0
     #   -r requirements/base.in
     #   -r requirements/test.in
     #   edx-rbac
-django-waffle==4.1.0
+django-waffle==4.2.0
     # via
     #   edx-django-utils
     #   edx-drf-extensions
@@ -134,7 +134,7 @@ factory-boy==3.3.1
     # via
     #   -r requirements/base.in
     #   -r requirements/test.in
-faker==30.8.2
+faker==33.0.0
     # via factory-boy
 filelock==3.16.1
     # via snowflake-connector-python
@@ -168,7 +168,7 @@ numpy==2.1.3
     # via
     #   -r requirements/base.in
     #   pandas
-packaging==24.1
+packaging==24.2
     # via
     #   py2neo
     #   pytest
@@ -203,7 +203,7 @@ pycparser==2.22
     # via cffi
 pygments==2.18.0
     # via py2neo
-pyjwt[crypto]==2.9.0
+pyjwt[crypto]==2.10.0
     # via
     #   drf-jwt
     #   edx-drf-extensions
@@ -274,7 +274,7 @@ snowflake-connector-python==3.12.3
     # via -r requirements/reporting.in
 sortedcontainers==2.4.0
     # via snowflake-connector-python
-sqlparse==0.5.1
+sqlparse==0.5.2
     # via django
 stevedore==5.3.0
     # via