Skip to content

Commit

Permalink
chore: Upgrade Python requirements (#36076)
Browse files Browse the repository at this point in the history
* chore: Upgrade Python requirements

* chore: Upgrade Python requirements (#36079)

* feat: Upgrade Python dependency urllib3 (#36081)

upgrade: upgrade urllib3 version

Commit generated by workflow `openedx/edx-platform/.github/workflows/upgrade-one-python-dependency.yml@refs/heads/master`

Co-authored-by: mumarkhan999 <[email protected]>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: mumarkhan999 <[email protected]>
  • Loading branch information
3 people authored Jan 8, 2025
1 parent 85ecad1 commit f452798
Show file tree
Hide file tree
Showing 13 changed files with 253 additions and 216 deletions.
4 changes: 4 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,7 @@ elasticsearch<7.14.0
# 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

# Cause: https://github.com/openedx/edx-lint/issues/475
# This can be unpinned once https://github.com/openedx/edx-lint/issues/476 has been resolved.
urllib3<2.3.0
7 changes: 7 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -181,3 +181,10 @@ social-auth-app-django<=5.4.1
# # Date: 2024-10-14
# # The edx-enterprise is currently using edx-rest-api-client==5.7.1, which needs to be updated first.
# edx-rest-api-client==5.7.1

# Date 2025-01-08
# elasticsearch==7.13.x is downgrading urllib3 from 2.2.3 to 1.26.20
# https://github.com/elastic/elasticsearch-py/blob/v7.13.4/setup.py#L42
# We are pinning this until we can upgrade to a version of elasticsearch that uses a more recent version of urllib3.
# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35126
elasticsearch==7.9.1
12 changes: 6 additions & 6 deletions requirements/edx-sandbox/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ cryptography==44.0.0
# via -r requirements/edx-sandbox/base.in
cycler==0.12.1
# via matplotlib
fonttools==4.55.2
fonttools==4.55.3
# via matplotlib
joblib==1.4.2
# via nltk
kiwisolver==1.4.7
kiwisolver==1.4.8
# via matplotlib
lxml[html-clean,html_clean]==5.3.0
# via
Expand All @@ -37,7 +37,7 @@ markupsafe==3.0.2
# via
# chem
# openedx-calc
matplotlib==3.9.3
matplotlib==3.10.0
# via -r requirements/edx-sandbox/base.in
mpmath==1.3.0
# via sympy
Expand All @@ -59,11 +59,11 @@ openedx-calc==4.0.1
# via -r requirements/edx-sandbox/base.in
packaging==24.2
# via matplotlib
pillow==11.0.0
pillow==11.1.0
# via matplotlib
pycparser==2.22
# via cffi
pyparsing==3.2.0
pyparsing==3.2.1
# via
# -r requirements/edx-sandbox/base.in
# chem
Expand All @@ -75,7 +75,7 @@ random2==1.0.2
# via -r requirements/edx-sandbox/base.in
regex==2024.11.6
# via nltk
scipy==1.14.1
scipy==1.15.0
# via
# -r requirements/edx-sandbox/base.in
# chem
Expand Down
76 changes: 40 additions & 36 deletions requirements/edx/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ acid-xblock==0.4.1
# via -r requirements/edx/kernel.in
aiohappyeyeballs==2.4.4
# via aiohttp
aiohttp==3.11.9
aiohttp==3.11.11
# via
# geoip2
# openai
aiosignal==1.3.1
aiosignal==1.3.2
# via aiohttp
algoliasearch==3.0.0
# via
Expand All @@ -37,7 +37,7 @@ asgiref==3.8.1
# django-countries
asn1crypto==1.5.1
# via snowflake-connector-python
attrs==24.2.0
attrs==24.3.0
# via
# -r requirements/edx/kernel.in
# aiohttp
Expand Down Expand Up @@ -72,13 +72,13 @@ bleach[css]==6.2.0
# xblock-poll
boto==2.49.0
# via -r requirements/edx/kernel.in
boto3==1.35.76
boto3==1.35.93
# via
# -r requirements/edx/kernel.in
# django-ses
# fs-s3fs
# ora2
botocore==1.35.76
botocore==1.35.93
# via
# -r requirements/edx/kernel.in
# boto3
Expand All @@ -101,7 +101,7 @@ celery==5.4.0
# edx-enterprise
# event-tracking
# openedx-learning
certifi==2024.8.30
certifi==2024.12.14
# via
# elasticsearch
# py2neo
Expand Down Expand Up @@ -138,7 +138,7 @@ click-plugins==1.1.1
# via celery
click-repl==0.3.0
# via celery
code-annotations==2.0.0
code-annotations==2.1.0
# via
# edx-enterprise
# edx-toggles
Expand Down Expand Up @@ -243,7 +243,7 @@ django==4.2.17
# xss-utils
django-appconf==1.0.6
# via django-statici18n
django-cache-memoize==0.2.0
django-cache-memoize==0.2.1
# via edx-enterprise
django-celery-results==2.5.1
# via -r requirements/edx/kernel.in
Expand Down Expand Up @@ -282,7 +282,7 @@ django-ipware==7.0.1
# -r requirements/edx/kernel.in
# edx-enterprise
# edx-proctoring
django-js-asset==2.2.0
django-js-asset==3.0.1
# via django-mptt
django-method-override==1.0.4
# via -r requirements/edx/kernel.in
Expand Down Expand Up @@ -319,7 +319,7 @@ django-oauth-toolkit==1.7.1
# edx-enterprise
django-object-actions==4.3.0
# via edx-enterprise
django-pipeline==3.1.0
django-pipeline==4.0.0
# via -r requirements/edx/kernel.in
django-push-notifications==3.1.0
# via edx-ace
Expand All @@ -329,7 +329,7 @@ django-sekizai==4.1.0
# via
# -r requirements/edx/kernel.in
# openedx-django-wiki
django-ses==4.3.0
django-ses==4.3.1
# via -r requirements/edx/bundled.in
django-simple-history==3.4.0
# via
Expand Down Expand Up @@ -430,7 +430,7 @@ edx-celeryutils==1.3.0
# super-csv
edx-codejail==3.5.2
# via -r requirements/edx/kernel.in
edx-completion==4.7.6
edx-completion==4.7.8
# via -r requirements/edx/kernel.in
edx-django-release-util==1.4.0
# via
Expand Down Expand Up @@ -503,7 +503,7 @@ edx-opaque-keys[django]==2.11.0
# ora2
edx-organizations==6.13.0
# via -r requirements/edx/kernel.in
edx-proctoring==4.18.4
edx-proctoring==5.0.1
# via
# -r requirements/edx/kernel.in
# edx-proctoring-proctortrack
Expand All @@ -520,7 +520,7 @@ edx-search==4.1.1
# openedx-forum
edx-sga==0.25.0
# via -r requirements/edx/bundled.in
edx-submissions==3.8.3
edx-submissions==3.8.4
# via
# -r requirements/edx/kernel.in
# ora2
Expand Down Expand Up @@ -549,6 +549,7 @@ edxval==2.7.0
elasticsearch==7.9.1
# via
# -c requirements/edx/../common_constraints.txt
# -c requirements/edx/../constraints.txt
# edx-search
# openedx-forum
enmerkar==0.7.1
Expand All @@ -562,7 +563,7 @@ event-tracking==3.0.0
# edx-completion
# edx-proctoring
# edx-search
fastavro==1.9.7
fastavro==1.10.0
# via openedx-events
filelock==3.16.1
# via snowflake-connector-python
Expand All @@ -588,16 +589,16 @@ geoip2==4.8.1
# via -r requirements/edx/kernel.in
glob2==0.7
# via -r requirements/edx/kernel.in
google-api-core[grpc]==2.23.0
google-api-core[grpc]==2.24.0
# via
# firebase-admin
# google-api-python-client
# google-cloud-core
# google-cloud-firestore
# google-cloud-storage
google-api-python-client==2.154.0
google-api-python-client==2.157.0
# via firebase-admin
google-auth==2.36.0
google-auth==2.37.0
# via
# google-api-core
# google-api-python-client
Expand Down Expand Up @@ -625,11 +626,11 @@ googleapis-common-protos==1.66.0
# via
# google-api-core
# grpcio-status
grpcio==1.68.1
grpcio==1.69.0
# via
# google-api-core
# grpcio-status
grpcio-status==1.68.1
grpcio-status==1.69.0
# via google-api-core
gunicorn==23.0.0
# via -r requirements/edx/kernel.in
Expand Down Expand Up @@ -663,7 +664,7 @@ ipaddress==1.0.23
# via -r requirements/edx/kernel.in
isodate==0.7.2
# via python3-saml
jinja2==3.1.4
jinja2==3.1.5
# via code-annotations
jmespath==1.0.1
# via
Expand Down Expand Up @@ -704,7 +705,7 @@ lazy==1.6
# xblock
loremipsum==1.0.5
# via ora2
lti-consumer-xblock==9.12.0
lti-consumer-xblock==9.12.1
# via -r requirements/edx/kernel.in
lxml[html-clean,html_clean]==5.3.0
# via
Expand All @@ -723,7 +724,7 @@ lxml-html-clean==0.4.1
# via lxml
mailsnake==1.6.4
# via -r requirements/edx/bundled.in
mako==1.3.7
mako==1.3.8
# via
# -r requirements/edx/kernel.in
# acid-xblock
Expand Down Expand Up @@ -770,9 +771,9 @@ mysqlclient==2.2.6
# via
# -r requirements/edx/kernel.in
# openedx-forum
newrelic==10.3.1
newrelic==10.4.0
# via edx-django-utils
nh3==0.2.19
nh3==0.2.20
# via -r requirements/edx/kernel.in
nltk==3.9.1
# via chem
Expand Down Expand Up @@ -839,7 +840,7 @@ optimizely-sdk==4.1.1
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/bundled.in
ora2==6.14.1
ora2==6.14.3
# via -r requirements/edx/bundled.in
packaging==24.2
# via
Expand Down Expand Up @@ -868,7 +869,7 @@ pgpy==0.6.0
# via edx-enterprise
piexif==1.1.3
# via -r requirements/edx/kernel.in
pillow==11.0.0
pillow==11.1.0
# via
# -r requirements/edx/kernel.in
# edx-enterprise
Expand All @@ -889,14 +890,14 @@ proto-plus==1.25.0
# via
# google-api-core
# google-cloud-firestore
protobuf==5.29.1
protobuf==5.29.2
# via
# google-api-core
# google-cloud-firestore
# googleapis-common-protos
# grpcio-status
# proto-plus
psutil==6.1.0
psutil==6.1.1
# via
# -r requirements/edx/kernel.in
# edx-django-utils
Expand All @@ -921,11 +922,11 @@ pycryptodomex==3.21.0
# edx-proctoring
# lti-consumer-xblock
# pyjwkest
pydantic==2.10.3
pydantic==2.10.4
# via camel-converter
pydantic-core==2.27.1
pydantic-core==2.27.2
# via pydantic
pygments==2.18.0
pygments==2.19.1
# via py2neo
pyjwkest==1.4.2
# via
Expand Down Expand Up @@ -969,7 +970,7 @@ pyopenssl==24.3.0
# via
# optimizely-sdk
# snowflake-connector-python
pyparsing==3.2.0
pyparsing==3.2.1
# via
# chem
# httplib2
Expand Down Expand Up @@ -1038,7 +1039,7 @@ random2==1.0.2
# via -r requirements/edx/kernel.in
recommender-xblock==3.0.0
# via -r requirements/edx/bundled.in
redis==5.2.0
redis==5.2.1
# via
# -r requirements/edx/kernel.in
# walrus
Expand Down Expand Up @@ -1095,7 +1096,7 @@ s3transfer==0.10.4
# via boto3
sailthru-client==2.2.3
# via edx-ace
scipy==1.14.1
scipy==1.15.0
# via
# chem
# openedx-calc
Expand Down Expand Up @@ -1159,7 +1160,7 @@ sortedcontainers==2.4.0
# snowflake-connector-python
soupsieve==2.6
# via beautifulsoup4
sqlparse==0.5.2
sqlparse==0.5.3
# via django
staff-graded-xblock==2.3.0
# via -r requirements/edx/bundled.in
Expand Down Expand Up @@ -1212,6 +1213,7 @@ uritemplate==4.1.1
# google-api-python-client
urllib3==2.2.3
# via
# -c requirements/edx/../common_constraints.txt
# botocore
# elasticsearch
# py2neo
Expand Down Expand Up @@ -1246,6 +1248,8 @@ webob==1.8.9
# via
# -r requirements/edx/kernel.in
# xblock
wheel==0.45.1
# via django-pipeline
wrapt==1.17.0
# via -r requirements/edx/kernel.in
xblock[django]==5.1.0
Expand Down
8 changes: 4 additions & 4 deletions requirements/edx/coverage.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
#
chardet==5.2.0
# via diff-cover
coverage==7.6.8
coverage==7.6.10
# via -r requirements/edx/coverage.in
diff-cover==9.2.0
diff-cover==9.2.1
# via -r requirements/edx/coverage.in
jinja2==3.1.4
jinja2==3.1.5
# via diff-cover
markupsafe==3.0.2
# via jinja2
pluggy==1.5.0
# via diff-cover
pygments==2.18.0
pygments==2.19.1
# via diff-cover
Loading

0 comments on commit f452798

Please sign in to comment.