Skip to content

Commit

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

Python Requirements Update
  • Loading branch information
nedbat authored Sep 2, 2021
2 parents 8a4d614 + 0e5dc5a commit cb19c87
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 16 deletions.
6 changes: 3 additions & 3 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fs==2.4.13
# via xblock
lxml==4.6.3
# via xblock
mako==1.1.4
mako==1.1.5
# via xblock-utils
markupsafe==2.0.1
# via
Expand All @@ -29,7 +29,7 @@ pytz==2021.1
# xblock
pyyaml==5.4.1
# via xblock
simplejson==3.17.3
simplejson==3.17.5
# via xblock-utils
six==1.16.0
# via
Expand All @@ -44,7 +44,7 @@ web-fragments==1.1.0
# xblock-utils
webob==1.8.7
# via xblock
xblock==1.5.0
xblock==1.5.1
# via
# -r requirements/base.in
# xblock-utils
Expand Down
4 changes: 4 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,7 @@ 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
14 changes: 8 additions & 6 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ appdirs==1.4.4
# via
# -r requirements/base.txt
# fs
astroid==2.6.6
astroid==2.7.3
# via pylint
coverage==5.5
# via -r requirements/test.txt
Expand All @@ -30,7 +30,7 @@ lxml==4.6.3
# via
# -r requirements/base.txt
# xblock
mako==1.1.4
mako==1.1.5
# via
# -r requirements/base.txt
# xblock-utils
Expand All @@ -47,9 +47,11 @@ pbr==5.6.0
# via
# -r requirements/test.txt
# stevedore
platformdirs==2.3.0
# via pylint
pycodestyle==2.7.0
# via -r requirements/quality.in
pylint==2.9.6
pylint==2.10.2
# via -r requirements/quality.in
pymongo==3.12.0
# via
Expand All @@ -69,7 +71,7 @@ pyyaml==5.4.1
# via
# -r requirements/base.txt
# xblock
simplejson==3.17.3
simplejson==3.17.5
# via
# -r requirements/base.txt
# xblock-utils
Expand All @@ -82,7 +84,7 @@ sqlparse==0.4.1
# via
# -r requirements/base.txt
# django
stevedore==3.3.0
stevedore==3.4.0
# via
# -r requirements/test.txt
# edx-opaque-keys
Expand All @@ -99,7 +101,7 @@ webob==1.8.7
# xblock
wrapt==1.12.1
# via astroid
xblock==1.5.0
xblock==1.5.1
# via
# -r requirements/base.txt
# xblock-utils
Expand Down
2 changes: 1 addition & 1 deletion requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ pbr==5.6.0
# via stevedore
pymongo==3.12.0
# via edx-opaque-keys
stevedore==3.3.0
stevedore==3.4.0
# via edx-opaque-keys
6 changes: 3 additions & 3 deletions requirements/tox.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ filelock==3.0.12
# virtualenv
packaging==21.0
# via tox
platformdirs==2.2.0
platformdirs==2.3.0
# via virtualenv
pluggy==0.13.1
pluggy==1.0.0
# via tox
py==1.10.0
# via tox
Expand All @@ -28,7 +28,7 @@ six==1.16.0
# virtualenv
toml==0.10.2
# via tox
tox==3.24.1
tox==3.24.3
# via -r requirements/tox.in
virtualenv==20.7.2
# via tox
6 changes: 3 additions & 3 deletions requirements/travis.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ packaging==21.0
# via
# -r requirements/tox.txt
# tox
platformdirs==2.2.0
platformdirs==2.3.0
# via
# -r requirements/tox.txt
# virtualenv
pluggy==0.13.1
pluggy==1.0.0
# via
# -r requirements/tox.txt
# tox
Expand All @@ -60,7 +60,7 @@ toml==0.10.2
# via
# -r requirements/tox.txt
# tox
tox==3.24.1
tox==3.24.3
# via -r requirements/tox.txt
urllib3==1.26.6
# via requests
Expand Down

0 comments on commit cb19c87

Please sign in to comment.