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 #429

Merged
merged 1 commit into from
Nov 21, 2023
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
16 changes: 8 additions & 8 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ attrs==23.1.0
# via -r requirements/base.in
bleach==6.1.0
# via -r requirements/base.in
boto3==1.28.79
boto3==1.29.4
# via fs-s3fs
botocore==1.31.79
botocore==1.32.4
# via
# boto3
# s3transfer
certifi==2023.7.22
certifi==2023.11.17
# via requests
cffi==1.16.0
# via pynacl
Expand All @@ -41,13 +41,13 @@ django==3.2.23
# jsonfield
# openedx-django-pyfs
# openedx-filters
django-appconf==1.0.5
django-appconf==1.0.6
# via django-statici18n
django-config-models==2.5.1
# via -r requirements/base.in
django-crum==0.7.9
# via edx-django-utils
django-filter==23.3
django-filter==23.4
# via -r requirements/base.in
django-statici18n==2.4.0
# via -r requirements/base.in
Expand Down Expand Up @@ -86,23 +86,23 @@ lxml==4.9.3
# via
# -r requirements/base.in
# xblock
mako==1.2.4
mako==1.3.0
# via
# -r requirements/base.in
# xblock
markupsafe==2.1.3
# via
# mako
# xblock
newrelic==9.1.1
newrelic==9.2.0
# via edx-django-utils
oauthlib==3.2.2
# via -r requirements/base.in
openedx-django-pyfs==3.4.0
# via -r requirements/base.in
openedx-filters==1.6.0
# via -r requirements/base.in
pbr==5.11.1
pbr==6.0.0
# via stevedore
psutil==5.9.6
# via edx-django-utils
Expand Down
56 changes: 33 additions & 23 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,20 @@ binaryornot==0.4.4
# cookiecutter
bleach==6.1.0
# via -r requirements/test.txt
boto3==1.28.79
boto3==1.29.4
# via
# -r requirements/test.txt
# fs-s3fs
botocore==1.31.79
botocore==1.32.4
# via
# -r requirements/test.txt
# boto3
# s3transfer
certifi==2023.7.22
cachetools==5.3.2
# via
# -r requirements/tox.txt
# tox
certifi==2023.11.17
# via
# -r requirements/test.txt
# requests
Expand All @@ -50,7 +54,9 @@ cffi==1.16.0
chardet==5.2.0
# via
# -r requirements/test.txt
# -r requirements/tox.txt
# binaryornot
# tox
charset-normalizer==3.3.2
# via
# -r requirements/test.txt
Expand All @@ -71,6 +77,10 @@ code-annotations==1.5.0
# via
# -r requirements/test.txt
# edx-lint
colorama==0.4.6
# via
# -r requirements/tox.txt
# tox
cookiecutter==2.4.0
# via
# -r requirements/test.txt
Expand All @@ -85,7 +95,7 @@ cryptography==41.0.5
# via
# -r requirements/test.txt
# secretstorage
ddt==1.6.0
ddt==1.7.0
# via -r requirements/test.txt
dill==0.3.7
# via
Expand All @@ -111,7 +121,7 @@ django==3.2.23
# openedx-django-pyfs
# openedx-filters
# xblock-sdk
django-appconf==1.0.5
django-appconf==1.0.6
# via
# -r requirements/test.txt
# django-statici18n
Expand All @@ -121,7 +131,7 @@ django-crum==0.7.9
# via
# -r requirements/test.txt
# edx-django-utils
django-filter==23.3
django-filter==23.4
# via -r requirements/test.txt
django-statici18n==2.4.0
# via -r requirements/test.txt
Expand Down Expand Up @@ -212,7 +222,7 @@ jmespath==1.0.1
# botocore
jsonfield==3.1.0
# via -r requirements/test.txt
keyring==24.2.0
keyring==24.3.0
# via
# -r requirements/test.txt
# twine
Expand All @@ -223,7 +233,7 @@ lxml==4.9.3
# -r requirements/test.txt
# xblock
# xblock-sdk
mako==1.2.4
mako==1.3.0
# via
# -r requirements/test.txt
# xblock
Expand Down Expand Up @@ -251,7 +261,7 @@ more-itertools==10.1.0
# via
# -r requirements/test.txt
# jaraco-classes
newrelic==9.1.1
newrelic==9.2.0
# via
# -r requirements/test.txt
# edx-django-utils
Expand All @@ -268,8 +278,9 @@ openedx-filters==1.6.0
packaging==23.2
# via
# -r requirements/tox.txt
# pyproject-api
# tox
pbr==5.11.1
pbr==6.0.0
# via
# -r requirements/test.txt
# stevedore
Expand All @@ -279,9 +290,11 @@ pkginfo==1.9.6
# twine
platformdirs==3.11.0
# via
# -c requirements/common_constraints.txt
# -r requirements/test.txt
# -r requirements/tox.txt
# pylint
# tox
# virtualenv
pluggy==1.3.0
# via
Expand All @@ -291,10 +304,6 @@ psutil==5.9.6
# via
# -r requirements/test.txt
# edx-django-utils
py==1.11.0
# via
# -r requirements/tox.txt
# tox
pycodestyle==2.11.1
# via -r requirements/test.txt
pycparser==2.21
Expand All @@ -305,7 +314,7 @@ pycryptodomex==3.19.0
# via
# -r requirements/test.txt
# pyjwkest
pygments==2.16.1
pygments==2.17.1
# via
# -r requirements/test.txt
# readme-renderer
Expand Down Expand Up @@ -344,6 +353,10 @@ pypng==0.20220715.0
# via
# -r requirements/test.txt
# xblock-sdk
pyproject-api==1.6.1
# via
# -r requirements/tox.txt
# tox
python-dateutil==2.8.2
# via
# -r requirements/test.txt
Expand Down Expand Up @@ -388,7 +401,7 @@ rfc3986==2.0.0
# via
# -r requirements/test.txt
# twine
rich==13.6.0
rich==13.7.0
# via
# -r requirements/test.txt
# cookiecutter
Expand All @@ -409,15 +422,13 @@ simplejson==3.19.2
six==1.16.0
# via
# -r requirements/test.txt
# -r requirements/tox.txt
# bleach
# edx-ccx-keys
# edx-lint
# fs
# fs-s3fs
# pyjwkest
# python-dateutil
# tox
sqlparse==0.4.4
# via
# -r requirements/test.txt
Expand All @@ -437,15 +448,14 @@ tomli==2.0.1
# -r requirements/test.txt
# -r requirements/tox.txt
# pylint
# pyproject-api
# tox
tomlkit==0.12.2
tomlkit==0.12.3
# via
# -r requirements/test.txt
# pylint
tox==3.28.0
# via
# -c requirements/common_constraints.txt
# -r requirements/tox.txt
tox==4.11.3
# via -r requirements/tox.txt
twine==4.0.2
# via -r requirements/test.txt
types-python-dateutil==2.8.19.14
Expand Down
7 changes: 4 additions & 3 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ 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

# 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
16 changes: 8 additions & 8 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ attrs==23.1.0
# via -r requirements/base.txt
bleach==6.1.0
# via -r requirements/base.txt
boto3==1.28.79
boto3==1.29.4
# via
# -r requirements/base.txt
# fs-s3fs
botocore==1.31.79
botocore==1.32.4
# via
# -r requirements/base.txt
# boto3
# s3transfer
certifi==2023.7.22
certifi==2023.11.17
# via
# -r requirements/base.txt
# requests
Expand Down Expand Up @@ -56,7 +56,7 @@ django==3.2.23
# jsonfield
# openedx-django-pyfs
# openedx-filters
django-appconf==1.0.5
django-appconf==1.0.6
# via
# -r requirements/base.txt
# django-statici18n
Expand All @@ -66,7 +66,7 @@ django-crum==0.7.9
# via
# -r requirements/base.txt
# edx-django-utils
django-filter==23.3
django-filter==23.4
# via -r requirements/base.txt
django-statici18n==2.4.0
# via -r requirements/base.txt
Expand Down Expand Up @@ -123,7 +123,7 @@ lxml==4.9.3
# -r requirements/base.txt
# edx-i18n-tools
# xblock
mako==1.2.4
mako==1.3.0
# via
# -r requirements/base.txt
# xblock
Expand All @@ -132,7 +132,7 @@ markupsafe==2.1.3
# -r requirements/base.txt
# mako
# xblock
newrelic==9.1.1
newrelic==9.2.0
# via
# -r requirements/base.txt
# edx-django-utils
Expand All @@ -144,7 +144,7 @@ openedx-filters==1.6.0
# via -r requirements/base.txt
path==16.7.1
# via edx-i18n-tools
pbr==5.11.1
pbr==6.0.0
# via
# -r requirements/base.txt
# stevedore
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ wheel==0.41.3
# The following packages are considered to be unsafe in a requirements file:
pip==23.3.1
# via -r requirements/pip.in
setuptools==68.2.2
setuptools==69.0.1
# via -r requirements/pip.in
Loading
Loading