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

Python Requirements Update #358

Merged
merged 3 commits into from
Mar 21, 2024
Merged
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
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ Change history for XBlock SDK

These are notable changes in XBlock.

0.9.0
-----
* Xblock bumped to 3.0.0. Removed the deprecated id_generator method parameter in xblock.runtime

0.8.0
-----
* Added support for python 3.12
Expand Down
26 changes: 14 additions & 12 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,17 @@ appdirs==1.4.4
# via fs
arrow==1.3.0
# via cookiecutter
asgiref==3.7.2
asgiref==3.8.0
# via django
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# django
binaryornot==0.4.4
# via cookiecutter
boto3==1.34.49
boto3==1.34.67
# via fs-s3fs
botocore==1.34.49
botocore==1.34.67
# via
# boto3
# s3transfer
Expand All @@ -28,7 +32,7 @@ click==8.1.7
# via cookiecutter
cookiecutter==2.6.0
# via -r requirements/base.in
django==3.2.24
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
Expand Down Expand Up @@ -74,17 +78,15 @@ pygments==2.17.2
# via rich
pypng==0.20220715.0
# via -r requirements/base.in
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
# via
# arrow
# botocore
# xblock
python-slugify==8.0.4
# via cookiecutter
pytz==2024.1
# via
# django
# xblock
# via xblock
pyyaml==6.0.1
# via
# cookiecutter
Expand All @@ -93,9 +95,9 @@ requests==2.31.0
# via
# -r requirements/base.in
# cookiecutter
rich==13.7.0
rich==13.7.1
# via cookiecutter
s3transfer==0.10.0
s3transfer==0.10.1
# via boto3
simplejson==3.19.2
# via
Expand All @@ -110,7 +112,7 @@ sqlparse==0.4.4
# via django
text-unidecode==1.3
# via python-slugify
types-python-dateutil==2.8.19.20240106
types-python-dateutil==2.9.0.20240316
# via arrow
typing-extensions==4.10.0
# via
Expand All @@ -128,7 +130,7 @@ webob==1.8.7
# via
# -r requirements/base.in
# xblock
xblock[django]==1.10.0
xblock[django]==3.0.0
# via -r requirements/base.in

# The following packages are considered to be unsafe in a requirements file:
Expand Down
6 changes: 3 additions & 3 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
cachetools==5.3.2
cachetools==5.3.3
# via tox
chardet==5.2.0
# via tox
Expand All @@ -16,7 +16,7 @@ filelock==3.13.1
# via
# tox
# virtualenv
packaging==23.2
packaging==24.0
# via
# pyproject-api
# tox
Expand All @@ -32,7 +32,7 @@ tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.13.0
tox==4.14.1
# via -r requirements/ci.in
virtualenv==20.25.1
# via tox
11 changes: 10 additions & 1 deletion requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,20 @@


# using LTS django version
Django<4.0
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
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
1 change: 1 addition & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@

# Common constraints for edx repos
-c common_constraints.txt
backports.zoneinfo;python_version<"3.9"
lxml<5.0.0
43 changes: 24 additions & 19 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
acid-xblock==0.2.1
acid-xblock==0.3.0
# via
# -r requirements/test.in
# -r requirements/test.txt
Expand All @@ -18,7 +18,7 @@ arrow==1.3.0
# -r requirements/base.txt
# -r requirements/test.txt
# cookiecutter
asgiref==3.7.2
asgiref==3.8.0
# via
# -r requirements/base.txt
# -r requirements/test.txt
Expand All @@ -27,23 +27,29 @@ astroid==3.1.0
# via
# pylint
# pylint-celery
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# -r requirements/test.txt
# django
binaryornot==0.4.4
# via
# -r requirements/base.txt
# -r requirements/test.txt
# cookiecutter
boto3==1.34.49
boto3==1.34.67
# via
# -r requirements/base.txt
# -r requirements/test.txt
# fs-s3fs
botocore==1.34.49
botocore==1.34.67
# via
# -r requirements/base.txt
# -r requirements/test.txt
# boto3
# s3transfer
cachetools==5.3.2
cachetools==5.3.3
# via
# -r requirements/test.txt
# tox
Expand Down Expand Up @@ -73,7 +79,7 @@ click==8.1.7
# edx-lint
click-log==0.4.0
# via edx-lint
code-annotations==1.6.0
code-annotations==1.7.0
# via edx-lint
colorama==0.4.6
# via
Expand All @@ -83,7 +89,7 @@ cookiecutter==2.6.0
# via
# -r requirements/base.txt
# -r requirements/test.txt
coverage[toml]==7.4.3
coverage[toml]==7.4.4
# via
# -r requirements/test.in
# -r requirements/test.txt
Expand All @@ -98,7 +104,7 @@ distlib==0.3.8
# via
# -r requirements/test.txt
# virtualenv
django==3.2.24
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -198,7 +204,7 @@ openedx-django-pyfs==3.5.0
# -r requirements/base.txt
# -r requirements/test.txt
# xblock
packaging==23.2
packaging==24.0
# via
# -r requirements/test.txt
# pyproject-api
Expand Down Expand Up @@ -249,7 +255,7 @@ pyproject-api==1.6.1
# via
# -r requirements/test.txt
# tox
pytest==8.0.2
pytest==8.1.1
# via
# -r requirements/test.txt
# pytest-cov
Expand All @@ -263,11 +269,11 @@ pytest-django==4.8.0
# via
# -r requirements/test.in
# -r requirements/test.txt
pytest-rerunfailures==13.0
pytest-rerunfailures==14.0
# via
# -r requirements/test.in
# -r requirements/test.txt
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
# via
# -r requirements/base.txt
# -r requirements/test.txt
Expand All @@ -284,7 +290,6 @@ pytz==2024.1
# via
# -r requirements/base.txt
# -r requirements/test.txt
# django
# xblock
pyyaml==6.0.1
# via
Expand All @@ -298,12 +303,12 @@ requests==2.31.0
# -r requirements/base.txt
# -r requirements/test.txt
# cookiecutter
rich==13.7.0
rich==13.7.1
# via
# -r requirements/base.txt
# -r requirements/test.txt
# cookiecutter
s3transfer==0.10.0
s3transfer==0.10.1
# via
# -r requirements/base.txt
# -r requirements/test.txt
Expand Down Expand Up @@ -343,13 +348,13 @@ tomli==2.0.1
# pyproject-api
# pytest
# tox
tomlkit==0.12.3
tomlkit==0.12.4
# via pylint
tox==4.13.0
tox==4.14.1
# via
# -r requirements/test.in
# -r requirements/test.txt
types-python-dateutil==2.8.19.20240106
types-python-dateutil==2.9.0.20240316
# via
# -r requirements/base.txt
# -r requirements/test.txt
Expand Down Expand Up @@ -382,7 +387,7 @@ webob==1.8.7
# -r requirements/base.txt
# -r requirements/test.txt
# xblock
xblock[django]==1.10.0
xblock[django]==3.0.0
# via
# -r requirements/base.txt
# -r requirements/test.txt
Expand Down
16 changes: 9 additions & 7 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@
#
# make upgrade
#
build==1.0.3
build==1.1.1
# via pip-tools
click==8.1.7
# via pip-tools
importlib-metadata==7.0.1
# via build
packaging==23.2
importlib-metadata==6.11.0
# via
# -c requirements/common_constraints.txt
# build
packaging==24.0
# via build
pip-tools==7.4.0
pip-tools==7.4.1
# via -r requirements/pip-tools.in
pyproject-hooks==1.0.0
# via
Expand All @@ -23,9 +25,9 @@ tomli==2.0.1
# build
# pip-tools
# pyproject-hooks
wheel==0.42.0
wheel==0.43.0
# via pip-tools
zipp==3.17.0
zipp==3.18.1
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
#
# make upgrade
#
wheel==0.42.0
wheel==0.43.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==24.0
# via -r requirements/pip.in
setuptools==69.1.1
setuptools==69.2.0
# via -r requirements/pip.in
Loading
Loading