Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
matrix:
os: [ubuntu-latest]
python-version: ['3.12']
toxenv: [quality, data-django42, reporting-django42, data-django52, reporting-django52]
toxenv: [quality, data-django42, reporting-django42]

steps:
- uses: actions/checkout@v4
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,4 @@ geckodriver/

# pyenv
.python-version
venv/
2 changes: 1 addition & 1 deletion enterprise_data/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Enterprise data api application. This Django app exposes API endpoints used by enterprises.
"""

__version__ = "10.21.16"
__version__ = "10.22.0"
68 changes: 35 additions & 33 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
#
# This file is autogenerated by pip-compile with Python 3.12
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
amqp==5.3.1
# via kombu
asgiref==3.10.0
asgiref==3.11.1
# via django
asn1crypto==1.5.1
# via snowflake-connector-python
awscli==1.42.59
awscli==1.44.32
# via -r requirements/reporting.in
bcrypt==5.0.0
# via paramiko
billiard==4.2.2
billiard==4.2.4
# via celery
boto3==1.40.59
boto3==1.42.42
# via
# -r requirements/reporting.in
# snowflake-connector-python
botocore==1.40.59
botocore==1.42.42
# via
# awscli
# boto3
# s3transfer
# snowflake-connector-python
celery==5.3.6
# via -r requirements/reporting.in
certifi==2025.10.5
certifi==2026.1.4
# via
# py2neo
# requests
Expand All @@ -41,7 +41,7 @@ charset-normalizer==3.4.4
# via
# requests
# snowflake-connector-python
click==8.3.0
click==8.3.1
# via
# celery
# click-didyoumean
Expand All @@ -56,7 +56,7 @@ click-repl==0.3.0
# via celery
colorama==0.4.6
# via awscli
cryptography==46.0.3
cryptography==46.0.4
# via
# -r requirements/reporting.in
# django-fernet-fields-v2
Expand All @@ -65,9 +65,10 @@ cryptography==46.0.3
# pyjwt
# pyopenssl
# snowflake-connector-python
django==4.2.25
django==4.2.28
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/base.in
# django-crum
# django-fernet-fields-v2
Expand Down Expand Up @@ -127,9 +128,9 @@ edx-rest-api-client==6.2.0
# via -r requirements/base.in
factory-boy==3.3.3
# via -r requirements/base.in
faker==37.12.0
faker==40.1.2
# via factory-boy
filelock==3.20.0
filelock==3.20.3
# via snowflake-connector-python
idna==3.11
# via
Expand All @@ -139,17 +140,19 @@ interchange==2021.0.4
# via py2neo
invoke==2.2.1
# via paramiko
jmespath==1.0.1
jmespath==1.1.0
# via
# boto3
# botocore
kombu==5.5.4
kombu==5.6.2
# via celery
monotonic==1.6
# via py2neo
mysql-connector-python==9.5.0
# via -r requirements/base.in
packaging==25.0
# via
# -c requirements/constraints.txt
# -r requirements/base.in
packaging==26.0
# via
# kombu
# py2neo
Expand All @@ -160,35 +163,35 @@ paramiko==4.0.0
# via -r requirements/reporting.in
pgpy==0.6.0
# via -r requirements/reporting.in
pillow==12.0.0
pillow==12.1.0
# via pansi
platformdirs==4.5.0
platformdirs==4.5.1
# via snowflake-connector-python
prompt-toolkit==3.0.52
# via click-repl
psutil==7.1.2
psutil==7.2.2
# via edx-django-utils
py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz
# via -r requirements/reporting.in
pyasn1==0.6.1
pyasn1==0.6.2
# via
# pgpy
# rsa
pycparser==2.23
pycparser==3.0
# via cffi
pygments==2.19.2
# via py2neo
pyjwt[crypto]==2.10.1
pyjwt[crypto]==2.11.0
# via
# drf-jwt
# edx-drf-extensions
# edx-rest-api-client
# snowflake-connector-python
pyminizip==0.2.6
# via -r requirements/reporting.in
pymongo==4.15.3
pymongo==4.16.0
# via edx-opaque-keys
pynacl==1.6.0
pynacl==1.6.2
# via
# edx-django-utils
# paramiko
Expand All @@ -215,7 +218,7 @@ rsa==4.7.2
# via awscli
rules==3.5
# via -r requirements/base.in
s3transfer==0.14.0
s3transfer==0.16.0
# via
# awscli
# boto3
Expand All @@ -228,31 +231,30 @@ six==1.17.0
# py2neo
# python-dateutil
# vertica-python
snowflake-connector-python==4.0.0
snowflake-connector-python==4.2.0
# via -r requirements/reporting.in
sortedcontainers==2.4.0
# via snowflake-connector-python
sqlparse==0.5.3
sqlparse==0.5.5
# via django
stevedore==5.5.0
stevedore==5.6.0
# via
# edx-django-utils
# edx-opaque-keys
tomlkit==0.13.3
tomlkit==0.14.0
# via snowflake-connector-python
typing-extensions==4.15.0
# via
# edx-opaque-keys
# pyopenssl
# snowflake-connector-python
tzdata==2025.2
tzdata==2025.3
# via
# celery
# faker
# kombu
unicodecsv==0.14.1
# via -r requirements/reporting.in
urllib3==2.5.0
urllib3==2.6.3
# via
# botocore
# py2neo
Expand All @@ -264,7 +266,7 @@ vine==5.1.0
# amqp
# celery
# kombu
wcwidth==0.2.14
wcwidth==0.5.3
# via prompt-toolkit

# The following packages are considered to be unsafe in a requirements file:
Expand Down
16 changes: 8 additions & 8 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
#
# This file is autogenerated by pip-compile with Python 3.12
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
cachetools==6.2.1
cachetools==7.0.0
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
coverage==7.11.0
coverage==7.13.3
# via -r requirements/ci.in
distlib==0.4.0
# via virtualenv
filelock==3.20.0
filelock==3.20.3
# via
# tox
# virtualenv
packaging==25.0
packaging==26.0
# via
# pyproject-api
# tox
platformdirs==4.5.0
platformdirs==4.5.1
# via
# tox
# virtualenv
pluggy==1.6.0
# via tox
pyproject-api==1.10.0
# via tox
tox==4.32.0
tox==4.34.1
# via -r requirements/ci.in
virtualenv==20.35.3
virtualenv==20.36.1
# via tox
8 changes: 7 additions & 1 deletion requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,15 @@
# this file from Github directly. It does not require packaging in edx-lint.

# using LTS django version
Django<5.0
Django<6.0

# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
# See https://github.com/openedx/edx-platform/issues/35126 for more info
elasticsearch<7.14.0

# pip 26 is incompatible with pip-tools hence causing failures during the build process
# Make upgrade command and all requirements upgrade jobs are broken due to this.
# The constraint can be removed once a release (pip-tools > 7.5.2) is available with support for pip 26
# Issue to track this dependency and unpin later on: https://github.com/jazzband/pip-tools/issues/2319
pip<26.0
11 changes: 11 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,14 @@

# Common constraints for edx repos
-c common_constraints.txt

# This package is installed in the edx-analytics-data-api service,
# which only supports Django<5. We're hard pinning here, too, to avoid
# dependency management hell of supporting both Django 4 and 5.
Django<5

# pip 25.3 is problematic with newer versions of pip-tools
pip<25.3

# AED 2026-02-04: No idea why we can't find version 9.6
mysql-connector-python<9.6
Loading
Loading