Skip to content

Commit

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

Python Requirements Update
  • Loading branch information
bseverino authored Oct 13, 2021
2 parents 0039015 + 05135aa commit 5a251fd
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 74 deletions.
20 changes: 8 additions & 12 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ celery==5.0.4
# via
# -c requirements/constraints.txt
# event-tracking
certifi==2021.5.30
certifi==2021.10.8
# via requests
cffi==1.14.6
# via cryptography
Expand All @@ -27,13 +27,13 @@ click==7.1.2
# click-didyoumean
# click-plugins
# click-repl
click-didyoumean==0.0.3
click-didyoumean==0.3.0
# via celery
click-plugins==1.1.1
# via celery
click-repl==0.2.0
# via celery
cryptography==3.4.8
cryptography==35.0.0
# via pyjwt
django==2.2.24
# via
Expand All @@ -48,7 +48,6 @@ django==2.2.24
# edx-when
# event-tracking
# jsonfield
# rest-condition
django-crum==0.7.9
# via
# -r requirements/base.in
Expand All @@ -75,7 +74,6 @@ djangorestframework==3.12.4
# -r requirements/base.in
# drf-jwt
# edx-drf-extensions
# rest-condition
drf-jwt==1.19.0
# via
# -c requirements/common_constraints.txt
Expand All @@ -85,7 +83,7 @@ edx-django-utils==4.4.0
# edx-drf-extensions
# edx-rest-api-client
# edx-when
edx-drf-extensions==7.0.1
edx-drf-extensions==8.0.0
# via
# -r requirements/base.in
# edx-when
Expand All @@ -96,7 +94,7 @@ edx-opaque-keys==2.2.2
# edx-when
edx-rest-api-client==5.4.0
# via -r requirements/base.in
edx-when==2.2.0
edx-when==2.2.1
# via -r requirements/base.in
event-tracking==1.1.1
# via -r requirements/base.in
Expand Down Expand Up @@ -124,13 +122,13 @@ psutil==5.8.0
# via edx-django-utils
pycparser==2.20
# via cffi
pycryptodomex==3.10.1
pycryptodomex==3.11.0
# via
# -r requirements/base.in
# pyjwkest
pyjwkest==1.4.2
# via edx-drf-extensions
pyjwt[crypto]==2.1.0
pyjwt[crypto]==2.2.0
# via
# -r requirements/base.in
# drf-jwt
Expand All @@ -145,7 +143,7 @@ python-dateutil==2.8.2
# -r requirements/base.in
# edx-drf-extensions
# xblock
pytz==2021.1
pytz==2021.3
# via
# -r requirements/base.in
# celery
Expand All @@ -161,8 +159,6 @@ requests==2.26.0
# edx-rest-api-client
# pyjwkest
# slumber
rest-condition==1.0.3
# via edx-drf-extensions
rules==3.0
# via -r requirements/base.in
semantic-version==2.8.5
Expand Down
2 changes: 1 addition & 1 deletion requirements/celery50.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ amqp==5.0.6
billiard==3.6.4.0
celery==5.0.4
click==7.1.2
click-didyoumean==0.0.3
click-didyoumean==0.3.0
click-repl==0.2.0
kombu==5.1.0
prompt-toolkit==3.0.20
Expand Down
10 changes: 5 additions & 5 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.6
# via requests
codecov==2.1.12
# via -r requirements/ci.in
coverage==5.5
coverage==6.0.1
# via codecov
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 @@ -48,5 +48,5 @@ tox-battery==0.6.1
# via -r requirements/ci.in
urllib3==1.26.7
# via requests
virtualenv==20.8.0
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 @@ -24,25 +24,6 @@ Django<2.3
# See comment.
drf-jwt<1.19.1

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

# 7.0.0 requires pyjwt[crypto] 2.1.0. See comment.


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


# 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 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
21 changes: 10 additions & 11 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
astroid==2.8.0
astroid==2.8.2
# via
# pylint
# pylint-celery
Expand All @@ -23,7 +23,7 @@ click-log==0.3.2
# via edx-lint
code-annotations==1.2.0
# via edx-lint
diff-cover==6.4.0
diff-cover==6.4.2
# via -r requirements/dev.in
distlib==0.3.3
# via virtualenv
Expand All @@ -35,13 +35,13 @@ django==2.2.24
# edx-i18n-tools
docutils==0.17.1
# via rstcheck
edx-i18n-tools==0.7.0
edx-i18n-tools==0.8.1
# via -r requirements/dev.in
edx-lint==5.1.0
edx-lint==5.2.0
# via
# -r requirements/dev.in
# -r requirements/quality.in
filelock==3.0.12
filelock==3.3.0
# via
# tox
# virtualenv
Expand All @@ -51,7 +51,7 @@ isort==5.9.3
# via
# -r requirements/quality.in
# pylint
jinja2==3.0.1
jinja2==3.0.2
# via
# code-annotations
# diff-cover
Expand All @@ -76,9 +76,9 @@ pbr==5.6.0
# via stevedore
pep517==0.11.0
# via pip-tools
pip-tools==6.3.0
pip-tools==6.3.1
# via -r requirements/dev.in
platformdirs==2.3.0
platformdirs==2.4.0
# via
# pylint
# virtualenv
Expand Down Expand Up @@ -114,7 +114,7 @@ pyparsing==2.4.7
# via packaging
python-slugify==5.0.2
# via code-annotations
pytz==2021.1
pytz==2021.3
# via django
pyyaml==5.4.1
# via
Expand All @@ -124,7 +124,6 @@ rstcheck==3.3.1
# via -r requirements/quality.in
six==1.16.0
# via
# edx-i18n-tools
# edx-lint
# tox
# virtualenv
Expand Down Expand Up @@ -152,7 +151,7 @@ typing-extensions==3.10.0.2
# via
# astroid
# pylint
virtualenv==20.8.0
virtualenv==20.8.1
# via tox
wheel==0.37.0
# via
Expand Down
10 changes: 5 additions & 5 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
astroid==2.8.0
astroid==2.8.2
# via
# pylint
# pylint-celery
Expand All @@ -24,13 +24,13 @@ django==2.2.24
# -r requirements/quality.in
docutils==0.17.1
# via rstcheck
edx-lint==5.1.0
edx-lint==5.2.0
# via -r requirements/quality.in
isort==5.9.3
# via
# -r requirements/quality.in
# pylint
jinja2==3.0.1
jinja2==3.0.2
# via code-annotations
lazy-object-proxy==1.6.0
# via astroid
Expand All @@ -40,7 +40,7 @@ mccabe==0.6.1
# via pylint
pbr==5.6.0
# via stevedore
platformdirs==2.3.0
platformdirs==2.4.0
# via pylint
pycodestyle==2.7.0
# via -r requirements/quality.in
Expand All @@ -62,7 +62,7 @@ pylint-plugin-utils==0.6
# pylint-django
python-slugify==5.0.2
# via code-annotations
pytz==2021.1
pytz==2021.3
# via django
pyyaml==5.4.1
# via code-annotations
Expand Down
Loading

0 comments on commit 5a251fd

Please sign in to comment.