Skip to content

Commit

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

Python Requirements Update
  • Loading branch information
mikix authored Oct 14, 2021
2 parents f6e2e9b + a3b197f commit d8df78c
Show file tree
Hide file tree
Showing 9 changed files with 129 additions and 172 deletions.
30 changes: 12 additions & 18 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
#
appdirs==1.4.4
# via fs
certifi==2021.5.30
certifi==2021.10.8
# via requests
cffi==1.14.6
# via cryptography
charset-normalizer==2.0.4
charset-normalizer==2.0.6
# via requests
cryptography==3.4.8
cryptography==35.0.0
# via pyjwt
django==2.2.24
# via
Expand All @@ -24,7 +24,6 @@ django==2.2.24
# drf-jwt
# edx-django-utils
# edx-drf-extensions
# rest-condition
django-crum==0.7.9
# via edx-django-utils
django-model-utils==4.1.1
Expand All @@ -37,7 +36,6 @@ djangorestframework==3.12.4
# via
# drf-jwt
# edx-drf-extensions
# rest-condition
drf-jwt==1.19.0
# via
# -c requirements/common_constraints.txt
Expand All @@ -46,10 +44,8 @@ edx-django-utils==4.4.0
# via
# -r requirements/base.in
# edx-drf-extensions
edx-drf-extensions==6.6.0
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
edx-drf-extensions==8.0.0
# via -r requirements/base.in
edx-opaque-keys==2.2.2
# via
# -r requirements/base.in
Expand All @@ -64,29 +60,29 @@ lxml==4.6.3
# via xblock
markupsafe==2.0.1
# via xblock
newrelic==6.8.1.164
newrelic==7.0.0.166
# via edx-django-utils
pbr==5.6.0
# via stevedore
psutil==5.8.0
# via edx-django-utils
pycparser==2.20
# via cffi
pycryptodomex==3.10.1
pycryptodomex==3.11.0
# via pyjwkest
pyjwkest==1.4.2
# via edx-drf-extensions
pyjwt[crypto]==1.7.1
pyjwt[crypto]==2.2.0
# via
# -c requirements/common_constraints.txt
# drf-jwt
# edx-drf-extensions
pymongo==3.12.0
# via edx-opaque-keys
python-dateutil==2.8.2
# via
# edx-drf-extensions
# xblock
pytz==2021.1
pytz==2021.3
# via
# django
# fs
Expand All @@ -97,8 +93,6 @@ requests==2.26.0
# via
# edx-drf-extensions
# pyjwkest
rest-condition==1.0.3
# via edx-drf-extensions
semantic-version==2.8.5
# via edx-drf-extensions
six==1.16.0
Expand All @@ -107,13 +101,13 @@ six==1.16.0
# fs
# pyjwkest
# python-dateutil
sqlparse==0.4.1
sqlparse==0.4.2
# via django
stevedore==3.4.0
# via
# edx-django-utils
# edx-opaque-keys
urllib3==1.26.6
urllib3==1.26.7
# via requests
web-fragments==1.1.0
# via xblock
Expand Down
18 changes: 9 additions & 9 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@
#
backports.entry-points-selectable==1.1.0
# via virtualenv
certifi==2021.5.30
certifi==2021.10.8
# via requests
charset-normalizer==2.0.4
charset-normalizer==2.0.6
# via requests
codecov==2.1.12
# via -r requirements/ci.in
coverage==5.5
coverage==6.0.1
# via codecov
distlib==0.3.2
distlib==0.3.3
# via virtualenv
filelock==3.0.12
filelock==3.3.0
# via
# tox
# virtualenv
idna==3.2
# via requests
packaging==21.0
# via tox
platformdirs==2.3.0
platformdirs==2.4.0
# via virtualenv
pluggy==1.0.0
# via tox
Expand All @@ -40,13 +40,13 @@ six==1.16.0
# virtualenv
toml==0.10.2
# via tox
tox==3.24.3
tox==3.24.4
# via
# -r requirements/ci.in
# tox-battery
tox-battery==0.6.1
# via -r requirements/ci.in
urllib3==1.26.6
urllib3==1.26.7
# via requests
virtualenv==20.7.2
virtualenv==20.8.1
# via tox
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
Loading

0 comments on commit d8df78c

Please sign in to comment.