Skip to content

Commit

Permalink
Merge pull request #31 from edx/jenkins/upgrade-python-requirements-8…
Browse files Browse the repository at this point in the history
…233a1d

Python Requirements Update
  • Loading branch information
nedbat authored Oct 5, 2021
2 parents 8233a1d + 018d990 commit 3e7a7bc
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 44 deletions.
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ markupsafe==2.0.1
# xblock
python-dateutil==2.8.2
# via xblock
pytz==2021.1
pytz==2021.3
# via
# django
# fs
Expand Down
19 changes: 0 additions & 19 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,6 @@ Django<2.3
# See pyjwt[crypto]<2.0.0 comment.
drf-jwt<1.19.1

# 4.0.0 requires pyjwt[crypto] 2.1.0. See pyjwt[crypto]<2.0.0 comment.
edx-auth-backends<4.0.0

# 7.0.0 requires pyjwt[crypto] 2.1.0. See pyjwt[crypto]<2.0.0 comment.
edx-drf-extensions<7.0.0

# PyJWT[crypto] 2.0.0 has a number of breaking changes that we are
# actively working to fix. A number of the active constraints are all related
# to this effort. Additionally, your IDA/service may also be affected directly
# by these changes. You should not upgrade without knowing what you are doing.
pyjwt[crypto]<2.0.0

# 5.0.0+ of social-auth-app-django requires social-auth-core>=4.1.0
social-auth-app-django<5.0.0

# latest version requires PyJWT>=2.0.0 but drf-jwt requires PyJWT[crypto]<2.0.0,>=1.5.2.
# See pyjwt[crypto]<2.0.0 comment.
social-auth-core<4.0.3

# 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
2 changes: 1 addition & 1 deletion requirements/pip_tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ click==8.0.1
# via pip-tools
pep517==0.11.0
# via pip-tools
pip-tools==6.2.0
pip-tools==6.3.0
# via -r requirements/pip_tools.in
tomli==1.2.1
# via pep517
Expand Down
14 changes: 7 additions & 7 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ appdirs==1.4.4
# fs
astroid==2.8.0
# via pylint
boto3==1.18.43
boto3==1.18.54
# via
# -r requirements/test.txt
# fs-s3fs
botocore==1.21.43
botocore==1.21.54
# via
# -r requirements/test.txt
# boto3
# s3transfer
coverage==5.5
coverage==6.0
# via -r requirements/test.txt
ddt==1.4.2
ddt==1.4.4
# via -r requirements/test.txt
django==2.2.24
# via
Expand Down Expand Up @@ -81,7 +81,7 @@ pbr==5.6.0
# via
# -r requirements/test.txt
# stevedore
platformdirs==2.3.0
platformdirs==2.4.0
# via pylint
pycodestyle==2.7.0
# via -r requirements/quality.in
Expand All @@ -97,7 +97,7 @@ python-dateutil==2.8.2
# -r requirements/test.txt
# botocore
# xblock
pytz==2021.1
pytz==2021.3
# via
# -r requirements/base.txt
# -r requirements/test.txt
Expand Down Expand Up @@ -140,7 +140,7 @@ typing-extensions==3.10.0.2
# via
# astroid
# pylint
urllib3==1.26.6
urllib3==1.26.7
# via
# -r requirements/test.txt
# botocore
Expand Down
12 changes: 6 additions & 6 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
#
appdirs==1.4.4
# via fs
boto3==1.18.43
boto3==1.18.54
# via fs-s3fs
botocore==1.21.43
botocore==1.21.54
# via
# boto3
# s3transfer
coverage==5.5
coverage==6.0
# via -r requirements/test.in
ddt==1.4.2
ddt==1.4.4
# via -r requirements/test.in
# via
# -c requirements/common_constraints.txt
Expand Down Expand Up @@ -55,7 +55,7 @@ python-dateutil==2.8.2
# via
# botocore
# xblock
pytz==2021.1
pytz==2021.3
# via
# django
# fs
Expand All @@ -75,7 +75,7 @@ sqlparse==0.4.2
# via django
stevedore==3.4.0
# via edx-opaque-keys
urllib3==1.26.6
urllib3==1.26.7
# via botocore
web-fragments==1.1.0
# via
Expand Down
8 changes: 4 additions & 4 deletions requirements/tox.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
#
backports.entry-points-selectable==1.1.0
# via virtualenv
distlib==0.3.2
distlib==0.3.3
# via virtualenv
filelock==3.0.12
filelock==3.3.0
# via
# tox
# virtualenv
packaging==21.0
# via tox
platformdirs==2.3.0
platformdirs==2.4.0
# via virtualenv
pluggy==1.0.0
# via tox
Expand All @@ -30,5 +30,5 @@ toml==0.10.2
# via tox
tox==3.24.4
# via -r requirements/tox.in
virtualenv==20.8.0
virtualenv==20.8.1
# via tox
12 changes: 6 additions & 6 deletions requirements/travis.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ backports.entry-points-selectable==1.1.0
# virtualenv
certifi==2021.5.30
# via requests
charset-normalizer==2.0.5
charset-normalizer==2.0.6
# via requests
coverage==5.5
# via coveralls
coveralls==3.2.0
# via -r requirements/travis.in
distlib==0.3.2
distlib==0.3.3
# via
# -r requirements/tox.txt
# virtualenv
docopt==0.6.2
# via coveralls
filelock==3.0.12
filelock==3.3.0
# via
# -r requirements/tox.txt
# tox
Expand All @@ -33,7 +33,7 @@ packaging==21.0
# via
# -r requirements/tox.txt
# tox
platformdirs==2.3.0
platformdirs==2.4.0
# via
# -r requirements/tox.txt
# virtualenv
Expand Down Expand Up @@ -62,9 +62,9 @@ toml==0.10.2
# tox
tox==3.24.4
# via -r requirements/tox.txt
urllib3==1.26.6
urllib3==1.26.7
# via requests
virtualenv==20.8.0
virtualenv==20.8.1
# via
# -r requirements/tox.txt
# tox

0 comments on commit 3e7a7bc

Please sign in to comment.