Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Upgrade Python requirements #282

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
107 changes: 47 additions & 60 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,31 +1,24 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
amqp==5.2.0
amqp==5.3.1
# via kombu
appdirs==1.4.4
# via fs
asgiref==3.8.1
# via django
backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# celery
# django
# djangorestframework
# kombu
billiard==4.2.0
billiard==4.2.1
# via celery
celery==5.3.6
celery==5.4.0
# via edx-celeryutils
certifi==2024.2.2
certifi==2024.8.30
# via requests
cffi==1.16.0
cffi==1.17.1
# via pynacl
charset-normalizer==3.3.2
charset-normalizer==3.4.0
# via requests
click==8.1.7
# via
Expand All @@ -40,7 +33,7 @@ click-plugins==1.1.1
# via celery
click-repl==0.3.0
# via celery
django==4.2.11
django==4.2.17
# via
# -c requirements/common_constraints.txt
# django-crum
Expand All @@ -56,102 +49,98 @@ django-crum==0.7.9
# via
# edx-django-utils
# super-csv
django-model-utils==4.4.0
django-model-utils==5.0.0
# via
# edx-bulk-grades
# edx-celeryutils
# super-csv
django-waffle==4.1.0
django-waffle==4.2.0
# via edx-django-utils
djangorestframework==3.15.1
djangorestframework==3.15.2
# via super-csv
edx-bulk-grades==1.0.2
dnspython==2.7.0
# via pymongo
edx-bulk-grades==1.1.0
# via -r requirements/base.in
edx-celeryutils==1.2.5
edx-celeryutils==1.3.0
# via super-csv
edx-django-utils==5.11.0
edx-django-utils==7.1.0
# via super-csv
edx-opaque-keys==2.5.1
edx-opaque-keys==2.11.0
# via edx-bulk-grades
fs==2.4.16
# via xblock
idna==3.6
idna==3.10
# via requests
importlib-metadata==6.11.0
# via
# -c requirements/common_constraints.txt
# markdown
jsonfield==3.1.0
# via edx-celeryutils
kombu==5.3.6
kombu==5.4.2
# via celery
lxml==5.1.0
lxml==5.3.0
# via xblock
mako==1.3.2
mako==1.3.8
# via xblock
markdown==3.6
markdown==3.7
# via -r requirements/base.in
markupsafe==2.1.5
markupsafe==3.0.2
# via
# mako
# xblock
newrelic==9.8.0
newrelic==10.3.1
# via edx-django-utils
path==16.10.0
path==17.0.0
# via path-py
path-py==12.5.0
# via -r requirements/base.in
pbr==6.0.0
pbr==6.1.0
# via stevedore
prompt-toolkit==3.0.43
prompt-toolkit==3.0.48
# via click-repl
psutil==5.9.8
psutil==6.1.0
# via edx-django-utils
pycparser==2.21
pycparser==2.22
# via cffi
pymongo==3.13.0
pymongo==4.10.1
# via edx-opaque-keys
pynacl==1.5.0
# via edx-django-utils
python-dateutil==2.9.0.post0
# via
# celery
# xblock
pytz==2024.1
pyyaml==6.0.1
pytz==2024.2
# via xblock
requests==2.31.0
pyyaml==6.0.2
# via xblock
requests==2.32.3
# via
# edx-bulk-grades
# slumber
simplejson==3.19.2
simplejson==3.19.3
# via
# super-csv
# xblock
six==1.16.0
six==1.17.0
# via
# fs
# python-dateutil
slumber==0.7.1
# via edx-bulk-grades
sqlparse==0.4.4
sqlparse==0.5.2
# via django
stevedore==5.2.0
stevedore==5.4.0
# via
# edx-django-utils
# edx-opaque-keys
super-csv==3.1.0
super-csv==3.2.0
# via edx-bulk-grades
typing-extensions==4.10.0
# via
# asgiref
# edx-opaque-keys
# kombu
tzdata==2024.1
typing-extensions==4.12.2
# via edx-opaque-keys
tzdata==2024.2
# via
# backports-zoneinfo
# celery
urllib3==2.2.1
# kombu
urllib3==2.2.3
# via requests
vine==5.1.0
# via
Expand All @@ -160,16 +149,14 @@ vine==5.1.0
# kombu
wcwidth==0.2.13
# via prompt-toolkit
web-fragments==2.1.0
web-fragments==2.2.0
# via
# -r requirements/base.in
# xblock
webob==1.8.7
webob==1.8.9
# via xblock
xblock==3.0.0
xblock==5.1.0
# via -r requirements/base.in
zipp==3.18.1
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# setuptools
27 changes: 11 additions & 16 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
cachetools==5.3.3
cachetools==5.5.0
# via
# -r requirements/tox.txt
# tox
Expand All @@ -16,43 +16,38 @@ colorama==0.4.6
# via
# -r requirements/tox.txt
# tox
distlib==0.3.8
distlib==0.3.9
# via
# -r requirements/tox.txt
# virtualenv
filelock==3.13.3
filelock==3.16.1
# via
# -r requirements/tox.txt
# tox
# virtualenv
packaging==24.0
packaging==24.2
# via
# -r requirements/tox.txt
# pyproject-api
# tox
platformdirs==4.2.0
platformdirs==4.3.6
# via
# -r requirements/tox.txt
# tox
# virtualenv
pluggy==1.4.0
pluggy==1.5.0
# via
# -r requirements/tox.txt
# tox
pyproject-api==1.6.1
pyproject-api==1.8.0
# via
# -r requirements/tox.txt
# tox
six==1.16.0
six==1.17.0
# via -r requirements/ci.in
tomli==2.0.1
# via
# -r requirements/tox.txt
# pyproject-api
# tox
tox==4.14.2
tox==4.23.2
# via -r requirements/tox.txt
virtualenv==20.25.1
virtualenv==20.28.0
# via
# -r requirements/tox.txt
# tox
13 changes: 4 additions & 9 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +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

# opentelemetry requires version 6.x at the moment:
# https://github.com/open-telemetry/opentelemetry-python/issues/3570
# Normally this could be added as a constraint in edx-django-utils, where we're
# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
# that uses version 7.x, and then there's no undoing that when compiling base.txt.
# So we need to pin it globally, for now.
# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
importlib-metadata<7
# 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
Loading