Skip to content

Commit

Permalink
Merge pull request #215 from edx/jenkins/upgrade-python-requirements-…
Browse files Browse the repository at this point in the history
…3ff7d7f

Python Requirements Update
  • Loading branch information
iamsobanjaved authored Nov 24, 2023
2 parents 3ff7d7f + 8ae2609 commit 8f7efe7
Show file tree
Hide file tree
Showing 11 changed files with 319 additions and 239 deletions.
30 changes: 16 additions & 14 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
appdirs==1.4.4
# via fs
asgiref==3.7.2
# via django
# via
# django
# django-cors-headers
async-timeout==4.0.3
# via redis
attrs==23.1.0
Expand All @@ -18,19 +20,19 @@ backports-zoneinfo==0.2.1
# via django
bleach==6.1.0
# via lti-consumer-xblock
boto3==1.28.69
boto3==1.29.6
# via fs-s3fs
botocore==1.31.69
botocore==1.32.6
# via
# boto3
# s3transfer
certifi==2023.7.22
certifi==2023.11.17
# via requests
cffi==1.16.0
# via
# cryptography
# pynacl
charset-normalizer==3.3.1
charset-normalizer==3.3.2
# via requests
click==8.1.7
# via
Expand All @@ -52,7 +54,7 @@ defusedxml==0.8.0rc2
# via
# python3-openid
# social-auth-core
django==4.2.6
django==4.2.7
# via
# -c requirements/constraints.txt
# -r requirements/base.in
Expand Down Expand Up @@ -83,19 +85,19 @@ django==4.2.6
# openedx-events
# openedx-filters
# social-auth-app-django
django-appconf==1.0.5
django-appconf==1.0.6
# via django-statici18n
django-config-models==2.5.1
# via lti-consumer-xblock
django-cors-headers==4.3.0
django-cors-headers==4.3.1
# via -r requirements/base.in
django-crum==0.7.9
# via
# edx-django-utils
# edx-toggles
django-extensions==3.2.3
# via -r requirements/base.in
django-filter==23.3
django-filter==23.4
# via lti-consumer-xblock
django-model-utils==4.3.1
# via -r requirements/base.in
Expand Down Expand Up @@ -141,7 +143,7 @@ edx-django-utils==5.8.0
# edx-event-bus-redis
# edx-rest-api-client
# edx-toggles
edx-drf-extensions==8.13.0
edx-drf-extensions==8.13.1
# via -r requirements/base.in
edx-event-bus-kafka==5.5.0
# via -r requirements/base.in
Expand Down Expand Up @@ -197,7 +199,7 @@ lxml==4.9.3
# via
# lti-consumer-xblock
# xblock
mako==1.2.4
mako==1.3.0
# via
# lti-consumer-xblock
# xblock
Expand All @@ -208,7 +210,7 @@ markupsafe==2.1.3
# xblock
mysqlclient==2.2.0
# via -r requirements/base.in
newrelic==9.1.1
newrelic==9.2.0
# via edx-django-utils
oauthlib==3.2.2
# via
Expand All @@ -219,7 +221,7 @@ openapi-codec==1.3.2
# via django-rest-swagger
openedx-django-pyfs==3.4.0
# via lti-consumer-xblock
openedx-events==9.0.1
openedx-events==9.2.0
# via
# -r requirements/base.in
# edx-event-bus-kafka
Expand All @@ -228,7 +230,7 @@ openedx-filters==1.6.0
# via lti-consumer-xblock
packaging==23.2
# via drf-yasg
pbr==5.11.1
pbr==6.0.0
# via stevedore
psutil==5.9.6
# via edx-django-utils
Expand Down
29 changes: 19 additions & 10 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,36 @@
#
# make upgrade
#
cachetools==5.3.2
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.7
# via virtualenv
filelock==3.13.1
# via
# tox
# virtualenv
packaging==23.2
# via tox
# via
# pyproject-api
# tox
platformdirs==3.11.0
# via virtualenv
# via
# -c requirements/common_constraints.txt
# tox
# virtualenv
pluggy==1.3.0
# via tox
py==1.11.0
# via tox
six==1.16.0
pyproject-api==1.6.1
# via tox
tomli==2.0.1
# via tox
tox==3.28.0
# via
# -c requirements/common_constraints.txt
# -r requirements/ci.in
virtualenv==20.24.6
# pyproject-api
# tox
tox==4.11.3
# via -r requirements/ci.in
virtualenv==20.24.7
# via tox
7 changes: 4 additions & 3 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ elasticsearch<7.14.0
# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected


# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
tox<4.0.0
# virtualenv latest version requires platformdirs<4.0 which conflicts with tox>4.0 version
# This constraint can be removed once the issue
# https://github.com/pypa/virtualenv/issues/2666 gets resolved
platformdirs<4.0
Loading

0 comments on commit 8f7efe7

Please sign in to comment.