Skip to content

Commit

Permalink
Merge pull request #35125 from openedx/repo-tools/upgrade-python-requ…
Browse files Browse the repository at this point in the history
…irements-69b4f69

chore: Upgrade Python requirements
  • Loading branch information
Feanil Patel authored Jul 16, 2024
2 parents b243b8d + 7a1c4d1 commit 91cfce9
Show file tree
Hide file tree
Showing 13 changed files with 275 additions and 263 deletions.
6 changes: 6 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -123,3 +123,9 @@ path<16.12.0

# Temporary to Support the python 3.11 Upgrade
backports.zoneinfo;python_version<"3.9" # Newer versions have zoneinfo available in the standard library

# Relevant GitHub Issue: https://github.com/openedx/edx-platform/issues/35126
# We need to upgrade the version of elasticsearch to atleast 7.15 before we can upgrade to Numpy 2.0.0
# Otherwise we see a failure while running the following command:
# export DJANGO_SETTINGS_MODULE=cms.envs.test; python manage.py cms check_reserved_keywords --override_file db_keyword_overrides.yml --report_path reports/reserved_keywords --report_file cms_reserved_keyword_report.csv
numpy<2.0.0
11 changes: 6 additions & 5 deletions requirements/edx-sandbox/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ cryptography==42.0.8
# via -r requirements/edx-sandbox/base.in
cycler==0.12.1
# via matplotlib
fonttools==4.53.0
fonttools==4.53.1
# via matplotlib
joblib==1.4.2
# via nltk
Expand All @@ -35,7 +35,7 @@ markupsafe==2.1.5
# via
# chem
# openedx-calc
matplotlib==3.9.0
matplotlib==3.9.1
# via -r requirements/edx-sandbox/base.in
mpmath==1.3.0
# via sympy
Expand All @@ -47,6 +47,7 @@ nltk==3.8.1
# chem
numpy==1.26.4
# via
# -c requirements/edx-sandbox/../constraints.txt
# chem
# contourpy
# matplotlib
Expand All @@ -56,7 +57,7 @@ openedx-calc==3.1.0
# via -r requirements/edx-sandbox/base.in
packaging==24.1
# via matplotlib
pillow==10.3.0
pillow==10.4.0
# via matplotlib
pycparser==2.22
# via cffi
Expand All @@ -72,7 +73,7 @@ random2==1.0.2
# via -r requirements/edx-sandbox/base.in
regex==2024.5.15
# via nltk
scipy==1.13.1
scipy==1.14.0
# via
# -r requirements/edx-sandbox/base.in
# chem
Expand All @@ -81,7 +82,7 @@ six==1.16.0
# via
# codejail-includes
# python-dateutil
sympy==1.12.1
sympy==1.13.0
# via
# -r requirements/edx-sandbox/base.in
# openedx-calc
Expand Down
76 changes: 39 additions & 37 deletions requirements/edx/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ bleach[css]==6.1.0
# xblock-poll
boto==2.49.0
# via -r requirements/edx/kernel.in
boto3==1.34.123
boto3==1.34.144
# via
# -r requirements/edx/kernel.in
# django-ses
# fs-s3fs
# ora2
botocore==1.34.123
botocore==1.34.144
# via
# -r requirements/edx/kernel.in
# boto3
Expand All @@ -91,7 +91,7 @@ celery==5.4.0
# edx-enterprise
# event-tracking
# openedx-learning
certifi==2024.6.2
certifi==2024.7.4
# via
# -r requirements/edx/paver.txt
# elasticsearch
Expand Down Expand Up @@ -160,7 +160,7 @@ defusedxml==0.7.1
# ora2
# python3-openid
# social-auth-core
django==4.2.13
django==4.2.14
# via
# -c requirements/edx/../common_constraints.txt
# -c requirements/edx/../constraints.txt
Expand Down Expand Up @@ -244,7 +244,7 @@ django-config-models==2.7.0
# edx-enterprise
# edx-name-affirmation
# lti-consumer-xblock
django-cors-headers==4.3.1
django-cors-headers==4.4.0
# via -r requirements/edx/kernel.in
django-countries==7.6.1
# via
Expand Down Expand Up @@ -299,7 +299,7 @@ django-mptt==0.16.0
# openedx-django-wiki
django-multi-email-field==0.7.0
# via edx-enterprise
django-mysql==4.13.0
django-mysql==4.14.0
# via -r requirements/edx/kernel.in
django-oauth-toolkit==1.7.1
# via
Expand Down Expand Up @@ -333,7 +333,7 @@ django-statici18n==2.5.0
# lti-consumer-xblock
# xblock-drag-and-drop-v2
# xblock-poll
django-storages==1.14.3
django-storages==1.14.4
# via
# -r requirements/edx/kernel.in
# edxval
Expand Down Expand Up @@ -412,7 +412,7 @@ edx-celeryutils==1.3.0
# super-csv
edx-codejail==3.4.1
# via -r requirements/edx/kernel.in
edx-completion==4.6.2
edx-completion==4.6.6
# via -r requirements/edx/kernel.in
edx-django-release-util==1.4.0
# via
Expand Down Expand Up @@ -491,7 +491,7 @@ edx-proctoring==4.18.1
# edx-proctoring-proctortrack
edx-rbac==1.9.0
# via edx-enterprise
edx-rest-api-client==5.6.1
edx-rest-api-client==5.7.1
# via
# -r requirements/edx/kernel.in
# edx-enterprise
Expand All @@ -500,7 +500,7 @@ edx-search==3.9.1
# via -r requirements/edx/kernel.in
edx-sga==0.25.0
# via -r requirements/edx/bundled.in
edx-submissions==3.7.1
edx-submissions==3.7.5
# via
# -r requirements/edx/kernel.in
# ora2
Expand Down Expand Up @@ -540,9 +540,9 @@ event-tracking==2.4.0
# edx-completion
# edx-proctoring
# edx-search
fastavro==1.9.4
fastavro==1.9.5
# via openedx-events
filelock==3.14.0
filelock==3.15.4
# via snowflake-connector-python
frozenlist==1.4.1
# via
Expand Down Expand Up @@ -572,7 +572,7 @@ html5lib==1.1
# via
# -r requirements/edx/kernel.in
# ora2
icalendar==5.0.12
icalendar==5.0.13
# via -r requirements/edx/kernel.in
idna==3.7
# via
Expand Down Expand Up @@ -603,7 +603,7 @@ jmespath==1.0.1
# botocore
joblib==1.4.2
# via nltk
jsondiff==2.0.0
jsondiff==2.1.2
# via edx-enterprise
jsonfield==3.1.0
# via
Expand All @@ -614,7 +614,7 @@ jsonfield==3.1.0
# edx-submissions
# lti-consumer-xblock
# ora2
jsonschema==4.22.0
jsonschema==4.23.0
# via
# drf-spectacular
# optimizely-sdk
Expand Down Expand Up @@ -682,7 +682,7 @@ markupsafe==2.1.5
# xblock
maxminddb==2.6.2
# via geoip2
meilisearch==0.31.3
meilisearch==0.31.4
# via -r requirements/edx/kernel.in
mock==5.1.0
# via -r requirements/edx/paver.txt
Expand All @@ -702,18 +702,19 @@ multidict==6.0.5
# yarl
mysqlclient==2.2.4
# via -r requirements/edx/kernel.in
newrelic==9.10.0
newrelic==9.12.0
# via
# -r requirements/edx/bundled.in
# edx-django-utils
nh3==0.2.17
nh3==0.2.18
# via -r requirements/edx/kernel.in
nltk==3.8.1
# via chem
nodeenv==1.9.1
# via -r requirements/edx/kernel.in
numpy==1.26.4
# via
# -c requirements/edx/../constraints.txt
# chem
# openedx-calc
# scipy
Expand Down Expand Up @@ -743,7 +744,7 @@ openedx-django-require==2.1.0
# via -r requirements/edx/kernel.in
openedx-django-wiki==2.1.0
# via -r requirements/edx/kernel.in
openedx-events==9.10.0
openedx-events==9.11.0
# via
# -r requirements/edx/kernel.in
# edx-event-bus-kafka
Expand All @@ -759,7 +760,7 @@ openedx-learning==0.10.0
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/kernel.in
openedx-mongodbproxy==0.2.0
openedx-mongodbproxy==0.2.1
# via -r requirements/edx/kernel.in
optimizely-sdk==4.1.1
# via
Expand Down Expand Up @@ -799,7 +800,7 @@ pgpy==0.6.0
# via edx-enterprise
piexif==1.1.3
# via -r requirements/edx/kernel.in
pillow==10.3.0
pillow==10.4.0
# via
# -r requirements/edx/kernel.in
# edx-enterprise
Expand All @@ -811,7 +812,7 @@ polib==1.2.0
# via edx-i18n-tools
prompt-toolkit==3.0.47
# via click-repl
psutil==5.9.8
psutil==6.0.0
# via
# -r requirements/edx/paver.txt
# edx-django-utils
Expand All @@ -831,9 +832,9 @@ pycryptodomex==3.20.0
# edx-proctoring
# lti-consumer-xblock
# pyjwkest
pydantic==2.7.3
pydantic==2.8.2
# via camel-converter
pydantic-core==2.18.4
pydantic-core==2.20.1
# via pydantic
pygments==2.18.0
# via
Expand Down Expand Up @@ -946,12 +947,13 @@ pyyaml==6.0.1
# drf-yasg
# edx-django-release-util
# edx-i18n-tools
# jsondiff
# xblock
random2==1.0.2
# via -r requirements/edx/kernel.in
recommender-xblock==2.2.0
# via -r requirements/edx/bundled.in
redis==5.0.5
redis==5.0.7
# via
# -r requirements/edx/kernel.in
# walrus
Expand Down Expand Up @@ -989,7 +991,7 @@ requests-oauthlib==2.0.0
# via
# -r requirements/edx/kernel.in
# social-auth-core
rpds-py==0.18.1
rpds-py==0.19.0
# via
# jsonschema
# referencing
Expand All @@ -999,17 +1001,17 @@ rules==3.4
# edx-enterprise
# edx-proctoring
# openedx-learning
s3transfer==0.10.1
s3transfer==0.10.2
# via boto3
sailthru-client==2.2.3
# via edx-ace
scipy==1.13.1
scipy==1.14.0
# via
# chem
# openedx-calc
semantic-version==2.10.0
# via edx-drf-extensions
shapely==2.0.4
shapely==2.0.5
# via -r requirements/edx/kernel.in
simplejson==3.19.2
# via
Expand Down Expand Up @@ -1052,7 +1054,7 @@ slumber==0.7.1
# edx-bulk-grades
# edx-enterprise
# edx-rest-api-client
snowflake-connector-python==3.10.1
snowflake-connector-python==3.11.0
# via edx-enterprise
social-auth-app-django==5.0.0
# via
Expand All @@ -1075,7 +1077,7 @@ sortedcontainers==2.4.0
# snowflake-connector-python
soupsieve==2.5
# via beautifulsoup4
sqlparse==0.5.0
sqlparse==0.5.1
# via django
staff-graded-xblock==2.3.0
# via -r requirements/edx/bundled.in
Expand All @@ -1090,15 +1092,15 @@ stevedore==5.2.0
# edx-opaque-keys
super-csv==3.2.0
# via edx-bulk-grades
sympy==1.12.1
sympy==1.13.0
# via openedx-calc
testfixtures==8.3.0
# via edx-enterprise
text-unidecode==1.3
# via python-slugify
tinycss2==1.2.1
# via bleach
tomlkit==0.12.5
tomlkit==0.13.0
# via snowflake-connector-python
tqdm==4.66.4
# via
Expand All @@ -1124,7 +1126,7 @@ uritemplate==4.1.1
# via
# drf-spectacular
# drf-yasg
urllib3==1.26.18
urllib3==1.26.19
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/paver.txt
Expand All @@ -1139,9 +1141,9 @@ vine==5.1.0
# amqp
# celery
# kombu
voluptuous==0.14.2
voluptuous==0.15.2
# via ora2
walrus==0.9.3
walrus==0.9.4
# via edx-event-bus-redis
watchdog==4.0.1
# via -r requirements/edx/paver.txt
Expand Down Expand Up @@ -1181,7 +1183,7 @@ xblock[django]==4.0.1
# xblock-drag-and-drop-v2
# xblock-google-drive
# xblock-utils
xblock-drag-and-drop-v2==4.0.2
xblock-drag-and-drop-v2==4.0.3
# via -r requirements/edx/bundled.in
xblock-google-drive==0.7.0
# via -r requirements/edx/bundled.in
Expand Down
4 changes: 2 additions & 2 deletions requirements/edx/coverage.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#
chardet==5.2.0
# via diff-cover
coverage==7.5.3
coverage==7.6.0
# via -r requirements/edx/coverage.in
diff-cover==9.0.0
diff-cover==9.1.0
# via -r requirements/edx/coverage.in
jinja2==3.1.4
# via diff-cover
Expand Down
Loading

0 comments on commit 91cfce9

Please sign in to comment.