Skip to content

Commit

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

Python Requirements Update
  • Loading branch information
mikix authored Oct 18, 2021
2 parents d8df78c + bfe2f32 commit a9e78e8
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 68 deletions.
20 changes: 9 additions & 11 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ appdirs==1.4.4
# via fs
certifi==2021.10.8
# via requests
cffi==1.14.6
cffi==1.15.0
# via cryptography
charset-normalizer==2.0.6
charset-normalizer==2.0.7
# via requests
cryptography==35.0.0
# via pyjwt
Expand All @@ -26,7 +26,7 @@ django==2.2.24
# edx-drf-extensions
django-crum==0.7.9
# via edx-django-utils
django-model-utils==4.1.1
django-model-utils==4.2.0
# via -r requirements/base.in
django-waffle==2.2.1
# via
Expand All @@ -36,10 +36,8 @@ djangorestframework==3.12.4
# via
# drf-jwt
# edx-drf-extensions
drf-jwt==1.19.0
# via
# -c requirements/common_constraints.txt
# edx-drf-extensions
drf-jwt==1.19.1
# via edx-drf-extensions
edx-django-utils==4.4.0
# via
# -r requirements/base.in
Expand All @@ -54,13 +52,13 @@ fs==2.4.13
# via xblock
future==0.18.2
# via pyjwkest
idna==3.2
idna==3.3
# via requests
lxml==4.6.3
# via xblock
markupsafe==2.0.1
# via xblock
newrelic==7.0.0.166
newrelic==7.2.2.169
# via edx-django-utils
pbr==5.6.0
# via stevedore
Expand All @@ -72,7 +70,7 @@ pycryptodomex==3.11.0
# via pyjwkest
pyjwkest==1.4.2
# via edx-drf-extensions
pyjwt[crypto]==2.2.0
pyjwt[crypto]==2.3.0
# via
# drf-jwt
# edx-drf-extensions
Expand All @@ -87,7 +85,7 @@ pytz==2021.3
# django
# fs
# xblock
pyyaml==5.4.1
pyyaml==6.0
# via xblock
requests==2.26.0
# via
Expand Down
8 changes: 4 additions & 4 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ backports.entry-points-selectable==1.1.0
# via virtualenv
certifi==2021.10.8
# via requests
charset-normalizer==2.0.6
charset-normalizer==2.0.7
# via requests
codecov==2.1.12
# via -r requirements/ci.in
coverage==6.0.1
coverage==6.0.2
# via codecov
distlib==0.3.3
# via virtualenv
filelock==3.3.0
filelock==3.3.1
# via
# tox
# virtualenv
idna==3.2
idna==3.3
# via requests
packaging==21.0
# via tox
Expand Down
4 changes: 0 additions & 4 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
# using LTS django version
Django<2.3

# latest version is causing e2e failures in edx-platform.
# See pyjwt[crypto]<2.0.0 comment.
drf-jwt<1.19.1

# 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
27 changes: 13 additions & 14 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ appdirs==1.4.4
# via
# -r requirements/quality.txt
# fs
astroid==2.8.2
astroid==2.8.3
# via
# -r requirements/quality.txt
# pylint
Expand All @@ -21,11 +21,11 @@ certifi==2021.10.8
# via
# -r requirements/quality.txt
# requests
cffi==1.14.6
cffi==1.15.0
# via
# -r requirements/quality.txt
# cryptography
charset-normalizer==2.0.6
charset-normalizer==2.0.7
# via
# -r requirements/quality.txt
# requests
Expand All @@ -45,7 +45,7 @@ code-annotations==1.2.0
# via
# -r requirements/quality.txt
# edx-lint
coverage[toml]==6.0.1
coverage[toml]==6.0.2
# via
# -r requirements/quality.txt
# pytest-cov
Expand Down Expand Up @@ -74,7 +74,7 @@ django-crum==0.7.9
# via
# -r requirements/quality.txt
# edx-django-utils
django-model-utils==4.1.1
django-model-utils==4.2.0
# via -r requirements/quality.txt
django-waffle==2.2.1
# via
Expand All @@ -86,9 +86,8 @@ djangorestframework==3.12.4
# -r requirements/quality.txt
# drf-jwt
# edx-drf-extensions
drf-jwt==1.19.0
drf-jwt==1.19.1
# via
# -c requirements/common_constraints.txt
# -r requirements/quality.txt
# edx-drf-extensions
edx-django-utils==4.4.0
Expand All @@ -113,7 +112,7 @@ future==0.18.2
# via
# -r requirements/quality.txt
# pyjwkest
idna==3.2
idna==3.3
# via
# -r requirements/quality.txt
# requests
Expand Down Expand Up @@ -156,7 +155,7 @@ mccabe==0.6.1
# pylint
mock==4.0.3
# via -r requirements/quality.txt
newrelic==7.0.0.166
newrelic==7.2.2.169
# via
# -r requirements/quality.txt
# edx-django-utils
Expand All @@ -172,11 +171,11 @@ pbr==5.6.0
# via
# -r requirements/quality.txt
# stevedore
pep517==0.11.0
pep517==0.11.1
# via
# -r requirements/pip-tools.txt
# pip-tools
pip-tools==6.3.1
pip-tools==6.4.0
# via -r requirements/pip-tools.txt
platformdirs==2.4.0
# via
Expand Down Expand Up @@ -215,7 +214,7 @@ pyjwkest==1.4.2
# via
# -r requirements/quality.txt
# edx-drf-extensions
pyjwt[crypto]==2.2.0
pyjwt[crypto]==2.3.0
# via
# -r requirements/quality.txt
# drf-jwt
Expand Down Expand Up @@ -272,7 +271,7 @@ pytz==2021.3
# django
# fs
# xblock
pyyaml==5.4.1
pyyaml==6.0
# via
# -r requirements/quality.txt
# code-annotations
Expand Down Expand Up @@ -345,7 +344,7 @@ wheel==0.37.0
# via
# -r requirements/pip-tools.txt
# pip-tools
wrapt==1.12.1
wrapt==1.13.2
# via
# -r requirements/quality.txt
# astroid
Expand Down
19 changes: 9 additions & 10 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ certifi==2021.10.8
# via
# -r requirements/test.txt
# requests
cffi==1.14.6
cffi==1.15.0
# via
# -r requirements/test.txt
# cryptography
charset-normalizer==2.0.6
charset-normalizer==2.0.7
# via
# -r requirements/test.txt
# requests
Expand All @@ -36,7 +36,7 @@ click==8.0.3
# code-annotations
code-annotations==1.2.0
# via -r requirements/test.txt
coverage[toml]==6.0.1
coverage[toml]==6.0.2
# via
# -r requirements/test.txt
# pytest-cov
Expand All @@ -60,7 +60,7 @@ django-crum==0.7.9
# via
# -r requirements/test.txt
# edx-django-utils
django-model-utils==4.1.1
django-model-utils==4.2.0
# via -r requirements/test.txt
django-waffle==2.2.1
# via
Expand All @@ -80,9 +80,8 @@ docutils==0.17.1
# readme-renderer
# restructuredtext-lint
# sphinx
drf-jwt==1.19.0
drf-jwt==1.19.1
# via
# -c requirements/common_constraints.txt
# -r requirements/test.txt
# edx-drf-extensions
edx-django-utils==4.4.0
Expand All @@ -105,7 +104,7 @@ future==0.18.2
# via
# -r requirements/test.txt
# pyjwkest
idna==3.2
idna==3.3
# via
# -r requirements/test.txt
# requests
Expand All @@ -131,7 +130,7 @@ markupsafe==2.0.1
# xblock
mock==4.0.3
# via -r requirements/test.txt
newrelic==7.0.0.166
newrelic==7.2.2.169
# via
# -r requirements/test.txt
# edx-django-utils
Expand Down Expand Up @@ -174,7 +173,7 @@ pyjwkest==1.4.2
# via
# -r requirements/test.txt
# edx-drf-extensions
pyjwt[crypto]==2.2.0
pyjwt[crypto]==2.3.0
# via
# -r requirements/test.txt
# drf-jwt
Expand Down Expand Up @@ -212,7 +211,7 @@ pytz==2021.3
# django
# fs
# xblock
pyyaml==5.4.1
pyyaml==6.0
# via
# -r requirements/test.txt
# code-annotations
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#
click==8.0.3
# via pip-tools
pep517==0.11.0
pep517==0.11.1
# via pip-tools
pip-tools==6.3.1
pip-tools==6.4.0
# via -r requirements/pip-tools.in
tomli==1.2.1
# via pep517
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wheel==0.37.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==21.2.4
pip==21.3
# via -r requirements/pip.in
setuptools==58.2.0
# via -r requirements/pip.in
Loading

0 comments on commit a9e78e8

Please sign in to comment.