Skip to content

Commit

Permalink
chore: upgrade edx-enterprise-data
Browse files Browse the repository at this point in the history
  • Loading branch information
muhammad-ammar committed Feb 13, 2024
1 parent ddca804 commit acbf865
Show file tree
Hide file tree
Showing 9 changed files with 51 additions and 38 deletions.
1 change: 1 addition & 0 deletions analyticsdataserver/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@
ANALYTICS_DATABASE_V1 = None
DATABASE_ROUTERS = ['analyticsdataserver.router.AnalyticsAPIRouter', 'analyticsdataserver.router.AnalyticsModelsRouter']
ENTERPRISE_REPORTING_DB_ALIAS = 'enterprise'
ENROLLMENTS_PAGE_SIZE = 10000

LMS_BASE_URL = None

Expand Down
1 change: 1 addition & 0 deletions analyticsdataserver/settings/local.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
ANALYTICS_DATABASE = 'analytics'
ENTERPRISE_REPORTING_DB_ALIAS = 'analytics'
ANALYTICS_DATABASE_V1 = 'analytics'
ENROLLMENTS_PAGE_SIZE = 10000

TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'

Expand Down
1 change: 1 addition & 0 deletions analyticsdataserver/settings/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
ANALYTICS_DATABASE = 'analytics'
ANALYTICS_DATABASE_V1 = 'analytics_v1'
ENTERPRISE_REPORTING_DB_ALIAS = 'default'
ENROLLMENTS_PAGE_SIZE = 10000

LMS_BASE_URL = 'http://lms-host'

Expand Down
16 changes: 9 additions & 7 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ backports-zoneinfo==0.2.1
# via django
boto==2.49.0
# via -r requirements/base.in
boto3==1.34.35
boto3==1.34.40
# via -r requirements/base.in
botocore==1.34.35
botocore==1.34.40
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -69,7 +69,7 @@ django-fernet-fields-v2==0.9
# via edx-enterprise-data
django-filter==23.5
# via edx-enterprise-data
django-model-utils==4.3.1
django-model-utils==4.4.0
# via
# edx-enterprise-data
# edx-rbac
Expand All @@ -90,7 +90,9 @@ djangorestframework==3.14.0
# edx-api-doc-tools
# edx-drf-extensions
djangorestframework-csv==3.0.2
# via -r requirements/base.in
# via
# -r requirements/base.in
# edx-enterprise-data
drf-jwt==1.19.2
# via edx-drf-extensions
drf-yasg==1.21.7
Expand All @@ -112,7 +114,7 @@ edx-drf-extensions==10.2.0
# -r requirements/base.in
# edx-enterprise-data
# edx-rbac
edx-enterprise-data==5.5.1
edx-enterprise-data==6.0.0
# via -r requirements/base.in
edx-opaque-keys==2.5.1
# via
Expand All @@ -128,7 +130,7 @@ edx-rest-api-client==5.6.1
# edx-enterprise-data
factory-boy==3.3.0
# via edx-enterprise-data
faker==22.7.0
faker==23.1.0
# via factory-boy
html5lib==1.1
# via -r requirements/base.in
Expand Down Expand Up @@ -215,7 +217,7 @@ stevedore==5.1.0
# via
# edx-django-utils
# edx-opaque-keys
tqdm==4.66.1
tqdm==4.66.2
# via -r requirements/base.in
typing-extensions==4.9.0
# via
Expand Down
18 changes: 10 additions & 8 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ backports-zoneinfo==0.2.1
# via django
boto==2.49.0
# via -r requirements/base.in
boto3==1.34.35
boto3==1.34.40
# via -r requirements/base.in
botocore==1.34.35
botocore==1.34.40
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -69,7 +69,7 @@ django-fernet-fields-v2==0.9
# via edx-enterprise-data
django-filter==23.5
# via edx-enterprise-data
django-model-utils==4.3.1
django-model-utils==4.4.0
# via
# edx-enterprise-data
# edx-rbac
Expand All @@ -90,7 +90,9 @@ djangorestframework==3.14.0
# edx-api-doc-tools
# edx-drf-extensions
djangorestframework-csv==3.0.2
# via -r requirements/base.in
# via
# -r requirements/base.in
# edx-enterprise-data
drf-jwt==1.19.2
# via edx-drf-extensions
drf-yasg==1.21.7
Expand All @@ -112,7 +114,7 @@ edx-drf-extensions==10.2.0
# -r requirements/base.in
# edx-enterprise-data
# edx-rbac
edx-enterprise-data==5.5.1
edx-enterprise-data==6.0.0
# via -r requirements/base.in
edx-opaque-keys==2.5.1
# via
Expand All @@ -128,7 +130,7 @@ edx-rest-api-client==5.6.1
# edx-enterprise-data
factory-boy==3.3.0
# via edx-enterprise-data
faker==22.7.0
faker==23.1.0
# via factory-boy
html5lib==1.1
# via -r requirements/base.in
Expand All @@ -150,7 +152,7 @@ markdown==3.5.2
# via -r requirements/base.in
markupsafe==2.1.5
# via jinja2
mysqlclient==2.2.3
mysqlclient==2.2.4
# via -r requirements/dev.in
newrelic==9.6.0
# via edx-django-utils
Expand Down Expand Up @@ -217,7 +219,7 @@ stevedore==5.1.0
# via
# edx-django-utils
# edx-opaque-keys
tqdm==4.66.1
tqdm==4.66.2
# via -r requirements/base.in
typing-extensions==4.9.0
# via
Expand Down
16 changes: 9 additions & 7 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ beautifulsoup4==4.12.3
# via pydata-sphinx-theme
boto==2.49.0
# via -r requirements/base.in
boto3==1.34.35
boto3==1.34.40
# via -r requirements/base.in
botocore==1.34.35
botocore==1.34.40
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -79,7 +79,7 @@ django-fernet-fields-v2==0.9
# via edx-enterprise-data
django-filter==23.5
# via edx-enterprise-data
django-model-utils==4.3.1
django-model-utils==4.4.0
# via
# edx-enterprise-data
# edx-rbac
Expand All @@ -100,7 +100,9 @@ djangorestframework==3.14.0
# edx-api-doc-tools
# edx-drf-extensions
djangorestframework-csv==3.0.2
# via -r requirements/base.in
# via
# -r requirements/base.in
# edx-enterprise-data
docutils==0.19
# via
# pydata-sphinx-theme
Expand All @@ -126,7 +128,7 @@ edx-drf-extensions==10.2.0
# -r requirements/base.in
# edx-enterprise-data
# edx-rbac
edx-enterprise-data==5.5.1
edx-enterprise-data==6.0.0
# via -r requirements/base.in
edx-opaque-keys==2.5.1
# via
Expand All @@ -142,7 +144,7 @@ edx-rest-api-client==5.6.1
# edx-enterprise-data
factory-boy==3.3.0
# via edx-enterprise-data
faker==22.7.0
faker==23.1.0
# via factory-boy
html5lib==1.1
# via -r requirements/base.in
Expand Down Expand Up @@ -272,7 +274,7 @@ stevedore==5.1.0
# via
# edx-django-utils
# edx-opaque-keys
tqdm==4.66.1
tqdm==4.66.2
# via -r requirements/base.in
typing-extensions==4.9.0
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ wheel==0.42.0
# The following packages are considered to be unsafe in a requirements file:
pip==24.0
# via -r requirements/pip.in
setuptools==69.0.3
setuptools==69.1.0
# via -r requirements/pip.in
18 changes: 10 additions & 8 deletions requirements/production.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ backports-zoneinfo==0.2.1
# via django
boto==2.49.0
# via -r requirements/base.in
boto3==1.34.35
boto3==1.34.40
# via -r requirements/base.in
botocore==1.34.35
botocore==1.34.40
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -69,7 +69,7 @@ django-fernet-fields-v2==0.9
# via edx-enterprise-data
django-filter==23.5
# via edx-enterprise-data
django-model-utils==4.3.1
django-model-utils==4.4.0
# via
# edx-enterprise-data
# edx-rbac
Expand All @@ -90,7 +90,9 @@ djangorestframework==3.14.0
# edx-api-doc-tools
# edx-drf-extensions
djangorestframework-csv==3.0.2
# via -r requirements/base.in
# via
# -r requirements/base.in
# edx-enterprise-data
drf-jwt==1.19.2
# via edx-drf-extensions
drf-yasg==1.21.7
Expand All @@ -112,7 +114,7 @@ edx-drf-extensions==10.2.0
# -r requirements/base.in
# edx-enterprise-data
# edx-rbac
edx-enterprise-data==5.5.1
edx-enterprise-data==6.0.0
# via -r requirements/base.in
edx-opaque-keys==2.5.1
# via
Expand All @@ -128,7 +130,7 @@ edx-rest-api-client==5.6.1
# edx-enterprise-data
factory-boy==3.3.0
# via edx-enterprise-data
faker==22.7.0
faker==23.1.0
# via factory-boy
gevent==23.9.1
# via -r requirements/production.in
Expand Down Expand Up @@ -156,7 +158,7 @@ markdown==3.5.2
# via -r requirements/base.in
markupsafe==2.1.5
# via jinja2
mysqlclient==2.2.3
mysqlclient==2.2.4
# via -r requirements/production.in
newrelic==9.6.0
# via
Expand Down Expand Up @@ -230,7 +232,7 @@ stevedore==5.1.0
# via
# edx-django-utils
# edx-opaque-keys
tqdm==4.66.1
tqdm==4.66.2
# via -r requirements/base.in
typing-extensions==4.9.0
# via
Expand Down
16 changes: 9 additions & 7 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ backports-zoneinfo==0.2.1
# via django
boto==2.49.0
# via -r requirements/base.in
boto3==1.34.35
boto3==1.34.40
# via -r requirements/base.in
botocore==1.34.35
botocore==1.34.40
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -82,7 +82,7 @@ django-fernet-fields-v2==0.9
# via edx-enterprise-data
django-filter==23.5
# via edx-enterprise-data
django-model-utils==4.3.1
django-model-utils==4.4.0
# via
# edx-enterprise-data
# edx-rbac
Expand All @@ -103,7 +103,9 @@ djangorestframework==3.14.0
# edx-api-doc-tools
# edx-drf-extensions
djangorestframework-csv==3.0.2
# via -r requirements/base.in
# via
# -r requirements/base.in
# edx-enterprise-data
drf-jwt==1.19.2
# via edx-drf-extensions
drf-yasg==1.21.7
Expand All @@ -125,7 +127,7 @@ edx-drf-extensions==10.2.0
# -r requirements/base.in
# edx-enterprise-data
# edx-rbac
edx-enterprise-data==5.5.1
edx-enterprise-data==6.0.0
# via -r requirements/base.in
edx-opaque-keys==2.5.1
# via
Expand All @@ -143,7 +145,7 @@ exceptiongroup==1.2.0
# via pytest
factory-boy==3.3.0
# via edx-enterprise-data
faker==22.7.0
faker==23.1.0
# via factory-boy
freezegun==1.4.0
# via -r requirements/test.in
Expand Down Expand Up @@ -279,7 +281,7 @@ tomli==2.0.1
# via
# coverage
# pytest
tqdm==4.66.1
tqdm==4.66.2
# via -r requirements/base.in
typing-extensions==4.9.0
# via
Expand Down

0 comments on commit acbf865

Please sign in to comment.