Skip to content

Commit

Permalink
Merge pull request #521 from openedx/repo-tools/upgrade-python-requir…
Browse files Browse the repository at this point in the history
…ements-0bf3eb8

chore: Upgrade Python requirements
  • Loading branch information
feanil authored Dec 18, 2024
2 parents 0bf3eb8 + 71a3be7 commit a945ae0
Show file tree
Hide file tree
Showing 9 changed files with 143 additions and 113 deletions.
32 changes: 16 additions & 16 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@ appdirs==1.4.4
# via fs
asgiref==3.8.1
# via django
attrs==24.2.0
attrs==24.3.0
# via -r requirements/base.in
bleach==6.2.0
# via -r requirements/base.in
boto3==1.35.60
boto3==1.35.82
# via fs-s3fs
botocore==1.35.60
botocore==1.35.82
# via
# boto3
# s3transfer
certifi==2024.8.30
certifi==2024.12.14
# via requests
cffi==1.17.1
# via pynacl
charset-normalizer==3.4.0
# via requests
click==8.1.7
# via edx-django-utils
django==4.2.16
django==4.2.17
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
Expand All @@ -49,17 +49,17 @@ django-crum==0.7.9
# via edx-django-utils
django-filter==24.3
# via -r requirements/base.in
django-statici18n==2.5.0
django-statici18n==2.6.0
# via -r requirements/base.in
django-waffle==4.1.0
django-waffle==4.2.0
# via edx-django-utils
djangorestframework==3.15.2
# via django-config-models
dnspython==2.7.0
# via pymongo
edx-ccx-keys==1.3.0
edx-ccx-keys==2.0.2
# via -r requirements/base.in
edx-django-utils==7.0.0
edx-django-utils==7.1.0
# via django-config-models
edx-opaque-keys[django]==2.11.0
# via
Expand Down Expand Up @@ -88,21 +88,21 @@ lxml==5.3.0
# via
# -r requirements/base.in
# xblock
mako==1.3.6
mako==1.3.8
# via
# -r requirements/base.in
# xblock
markupsafe==3.0.2
# via
# mako
# xblock
newrelic==10.2.0
newrelic==10.4.0
# via edx-django-utils
oauthlib==3.2.2
# via -r requirements/base.in
openedx-django-pyfs==3.7.0
# via -r requirements/base.in
openedx-filters==1.11.0
openedx-filters==1.12.0
# via -r requirements/base.in
pbr==6.1.0
# via stevedore
Expand Down Expand Up @@ -130,20 +130,20 @@ pyyaml==6.0.2
# via xblock
requests==2.32.3
# via pyjwkest
s3transfer==0.10.3
s3transfer==0.10.4
# via boto3
simplejson==3.19.3
# via xblock
six==1.16.0
six==1.17.0
# via
# edx-ccx-keys
# fs
# fs-s3fs
# pyjwkest
# python-dateutil
sqlparse==0.5.2
sqlparse==0.5.3
# via django
stevedore==5.3.0
stevedore==5.4.0
# via
# edx-django-utils
# edx-opaque-keys
Expand Down
67 changes: 41 additions & 26 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ asgiref==3.8.1
# via
# -r requirements/test.txt
# django
astroid==3.3.5
astroid==3.3.6
# via
# -r requirements/test.txt
# pylint
# pylint-celery
attrs==24.2.0
attrs==24.3.0
# via -r requirements/test.txt
backports-tarfile==1.2.0
# via
Expand All @@ -33,11 +33,11 @@ binaryornot==0.4.4
# cookiecutter
bleach==6.2.0
# via -r requirements/test.txt
boto3==1.35.60
boto3==1.35.82
# via
# -r requirements/test.txt
# fs-s3fs
botocore==1.35.60
botocore==1.35.82
# via
# -r requirements/test.txt
# boto3
Expand All @@ -46,13 +46,14 @@ cachetools==5.5.0
# via
# -r requirements/tox.txt
# tox
certifi==2024.8.30
certifi==2024.12.14
# via
# -r requirements/test.txt
# requests
cffi==1.17.1
# via
# -r requirements/test.txt
# cryptography
# pynacl
chardet==5.2.0
# via
Expand All @@ -76,7 +77,7 @@ click-log==0.4.0
# via
# -r requirements/test.txt
# edx-lint
code-annotations==1.8.0
code-annotations==2.1.0
# via
# -r requirements/test.txt
# edx-lint
Expand All @@ -88,12 +89,16 @@ cookiecutter==2.6.0
# via
# -r requirements/test.txt
# xblock-sdk
coverage[toml]==7.6.4
coverage[toml]==7.6.9
# via
# -r requirements/test.txt
# coveralls
coveralls==4.0.1
# via -r requirements/test.txt
cryptography==44.0.0
# via
# -r requirements/test.txt
# secretstorage
ddt==1.7.2
# via -r requirements/test.txt
dill==0.3.9
Expand All @@ -104,7 +109,7 @@ distlib==0.3.9
# via
# -r requirements/tox.txt
# virtualenv
django==4.2.16
django==4.2.17
# via
# -c requirements/common_constraints.txt
# -r requirements/test.txt
Expand Down Expand Up @@ -132,9 +137,9 @@ django-crum==0.7.9
# edx-django-utils
django-filter==24.3
# via -r requirements/test.txt
django-statici18n==2.5.0
django-statici18n==2.6.0
# via -r requirements/test.txt
django-waffle==4.1.0
django-waffle==4.2.0
# via
# -r requirements/test.txt
# edx-django-utils
Expand All @@ -154,9 +159,9 @@ docutils==0.21.2
# via
# -r requirements/test.txt
# readme-renderer
edx-ccx-keys==1.3.0
edx-ccx-keys==2.0.2
# via -r requirements/test.txt
edx-django-utils==7.0.0
edx-django-utils==7.1.0
# via
# -r requirements/test.txt
# django-config-models
Expand Down Expand Up @@ -194,7 +199,6 @@ importlib-metadata==8.5.0
# via
# -r requirements/test.txt
# keyring
# twine
isort==5.13.2
# via
# -r requirements/test.txt
Expand All @@ -211,6 +215,11 @@ jaraco-functools==4.1.0
# via
# -r requirements/test.txt
# keyring
jeepney==0.8.0
# via
# -r requirements/test.txt
# keyring
# secretstorage
jinja2==3.1.4
# via
# -r requirements/test.txt
Expand All @@ -234,7 +243,7 @@ lxml==5.3.0
# -r requirements/test.txt
# xblock
# xblock-sdk
mako==1.3.6
mako==1.3.8
# via
# -r requirements/test.txt
# xblock
Expand Down Expand Up @@ -263,30 +272,32 @@ more-itertools==10.5.0
# -r requirements/test.txt
# jaraco-classes
# jaraco-functools
newrelic==10.2.0
newrelic==10.4.0
# via
# -r requirements/test.txt
# edx-django-utils
nh3==0.2.18
nh3==0.2.20
# via
# -r requirements/test.txt
# readme-renderer
oauthlib==3.2.2
# via -r requirements/test.txt
openedx-django-pyfs==3.7.0
# via -r requirements/test.txt
openedx-filters==1.11.0
openedx-filters==1.12.0
# via -r requirements/test.txt
packaging==24.2
# via
# -r requirements/test.txt
# -r requirements/tox.txt
# pyproject-api
# tox
# twine
pbr==6.1.0
# via
# -r requirements/test.txt
# stevedore
pkginfo==1.10.0
pkginfo==1.12.0
# via
# -r requirements/test.txt
# twine
Expand Down Expand Up @@ -322,7 +333,7 @@ pygments==2.18.0
# rich
pyjwkest==1.4.2
# via -r requirements/test.txt
pylint==3.3.1
pylint==3.3.2
# via
# -r requirements/test.txt
# edx-lint
Expand Down Expand Up @@ -405,16 +416,20 @@ rich==13.9.4
# -r requirements/test.txt
# cookiecutter
# twine
s3transfer==0.10.3
s3transfer==0.10.4
# via
# -r requirements/test.txt
# boto3
secretstorage==3.3.3
# via
# -r requirements/test.txt
# keyring
simplejson==3.19.3
# via
# -r requirements/test.txt
# xblock
# xblock-sdk
six==1.16.0
six==1.17.0
# via
# -r requirements/test.txt
# edx-ccx-keys
Expand All @@ -423,11 +438,11 @@ six==1.16.0
# fs-s3fs
# pyjwkest
# python-dateutil
sqlparse==0.5.2
sqlparse==0.5.3
# via
# -r requirements/test.txt
# django
stevedore==5.3.0
stevedore==5.4.0
# via
# -r requirements/test.txt
# code-annotations
Expand All @@ -443,9 +458,9 @@ tomlkit==0.13.2
# pylint
tox==4.23.2
# via -r requirements/tox.txt
twine==5.1.1
twine==6.0.1
# via -r requirements/test.txt
types-python-dateutil==2.9.0.20241003
types-python-dateutil==2.9.0.20241206
# via
# -r requirements/test.txt
# arrow
Expand All @@ -460,7 +475,7 @@ urllib3==1.26.20
# botocore
# requests
# twine
virtualenv==20.27.1
virtualenv==20.28.0
# via
# -r requirements/tox.txt
# tox
Expand Down
6 changes: 5 additions & 1 deletion requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,17 @@
# Note: Changes to this file will automatically be used by other repos, referencing
# this file from Github directly. It does not require packaging in edx-lint.


# using LTS django version
Django<5.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

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
django-simple-history==3.0.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
Loading

0 comments on commit a945ae0

Please sign in to comment.