Skip to content

Commit

Permalink
Merge 5826121 into a5ca2cd
Browse files Browse the repository at this point in the history
  • Loading branch information
@edx-requirements-bot
edx-requirements-bot committed Aug 6, 2021
2 parents a5ca2cd + 5826121 commit c9515f2
Show file tree
Hide file tree
Showing 7 changed files with 217 additions and 216 deletions.
56 changes: 28 additions & 28 deletions requirements/base.txt
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
#
# This file is autogenerated by pip-compile
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# make upgrade
#
appdirs==1.4.4
# via fs
bleach==3.3.0
bleach==4.0.0
# via -r requirements/base.in
certifi==2021.5.30
# via requests
chardet==4.0.0
charset-normalizer==2.0.4
# via requests
django-config-models==2.1.1
# via
# -c requirements/constraints.txt
# -r requirements/base.in
django-crum==0.7.9
# via edx-django-utils
django-filter==2.4.0
# via -r requirements/base.in
django-waffle==2.2.0
# via edx-django-utils
django==2.2.24
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
# django-config-models
# django-crum
# django-filter
# djangorestframework
# edx-django-utils
# edx-opaque-keys
# jsonfield2
django-config-models==2.2.0
# via
# -c requirements/constraints.txt
# -r requirements/base.in
django-crum==0.7.9
# via edx-django-utils
django-filter==2.4.0
# via -r requirements/base.in
django-waffle==2.2.1
# via edx-django-utils
djangorestframework==3.12.4
# via
# -c requirements/constraints.txt
# django-config-models
edx-django-utils==4.1.0
edx-django-utils==4.2.0
# via django-config-models
edx-opaque-keys[django]==2.2.1
edx-opaque-keys[django]==2.2.2
# via -r requirements/base.in
fs==2.4.13
# via xblock
future==0.18.2
# via pyjwkest
idna==2.10
idna==3.2
# via requests
jsonfield2==3.0.3
# via
Expand All @@ -64,11 +64,11 @@ markupsafe==2.0.1
# via
# mako
# xblock
newrelic==6.4.3.160
newrelic==6.8.0.163
# via edx-django-utils
oauthlib==3.1.1
# via -r requirements/base.in
packaging==20.9
packaging==21.0
# via bleach
pbr==5.6.0
# via stevedore
Expand All @@ -80,11 +80,11 @@ pycryptodomex==3.10.1
# pyjwkest
pyjwkest==1.4.2
# via -r requirements/base.in
pymongo==3.11.4
pymongo==3.12.0
# via edx-opaque-keys
pyparsing==2.4.7
# via packaging
python-dateutil==2.8.1
python-dateutil==2.8.2
# via xblock
pytz==2021.1
# via
Expand All @@ -93,9 +93,9 @@ pytz==2021.1
# xblock
pyyaml==5.4.1
# via xblock
requests==2.25.1
requests==2.26.0
# via pyjwkest
simplejson==3.17.2
simplejson==3.17.3
# via xblock-utils
six==1.16.0
# via
Expand All @@ -109,22 +109,22 @@ stevedore==3.3.0
# via
# edx-django-utils
# edx-opaque-keys
urllib3==1.26.5
urllib3==1.26.6
# via requests
web-fragments==1.0.0
web-fragments==1.1.0
# via
# xblock
# xblock-utils
webencodings==0.5.1
# via bleach
webob==1.8.7
# via xblock
xblock-utils==2.1.3
# via -r requirements/base.in
xblock==1.4.2
xblock==1.5.0
# via
# -r requirements/base.in
# xblock-utils
xblock-utils==2.2.0
# via -r requirements/base.in

# The following packages are considered to be unsafe in a requirements file:
# setuptools
7 changes: 3 additions & 4 deletions requirements/common_constraints.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@
# using LTS django version
Django<2.3

# docutils version 0.17 is causing docs rendering to fail
# See https://sourceforge.net/p/docutils/bugs/417/
docutils==0.16

# latest version is causing e2e failures in edx-platform.
drf-jwt<1.19.1

# Newer versions causing tests failures in multiple repos.
pyjwt[crypto]==1.7.1

# latest version requires PyJWT>=2.0.0 but drf-jwt requires PyJWT[crypto]<2.0.0,>=1.5.2
social-auth-core<4.0.3
63 changes: 31 additions & 32 deletions requirements/dev.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# make upgrade
Expand All @@ -8,28 +8,16 @@ appdirs==1.4.4
# via
# -r requirements/base.txt
# fs
bleach==3.3.0
bleach==4.0.0
# via -r requirements/base.txt
certifi==2021.5.30
# via
# -r requirements/base.txt
# requests
chardet==4.0.0
charset-normalizer==2.0.4
# via
# -r requirements/base.txt
# requests
django-config-models==2.1.1
# via -r requirements/base.txt
django-crum==0.7.9
# via
# -r requirements/base.txt
# edx-django-utils
django-filter==2.4.0
# via -r requirements/base.txt
django-waffle==2.2.0
# via
# -r requirements/base.txt
# edx-django-utils
django==2.2.24
# via
# -r requirements/base.txt
Expand All @@ -39,19 +27,30 @@ django==2.2.24
# djangorestframework
# edx-django-utils
# edx-i18n-tools
# edx-opaque-keys
# jsonfield2
django-config-models==2.2.0
# via -r requirements/base.txt
django-crum==0.7.9
# via
# -r requirements/base.txt
# edx-django-utils
django-filter==2.4.0
# via -r requirements/base.txt
django-waffle==2.2.1
# via
# -r requirements/base.txt
# edx-django-utils
djangorestframework==3.12.4
# via
# -r requirements/base.txt
# django-config-models
edx-django-utils==4.1.0
edx-django-utils==4.2.0
# via
# -r requirements/base.txt
# django-config-models
edx-i18n-tools==0.5.0
# via -r requirements/dev.in
edx-opaque-keys[django]==2.2.1
edx-opaque-keys[django]==2.2.2
# via -r requirements/base.txt
fs==2.4.13
# via
Expand All @@ -61,7 +60,7 @@ future==0.18.2
# via
# -r requirements/base.txt
# pyjwkest
idna==2.10
idna==3.2
# via
# -r requirements/base.txt
# requests
Expand All @@ -82,20 +81,20 @@ markupsafe==2.0.1
# -r requirements/base.txt
# mako
# xblock
newrelic==6.4.3.160
newrelic==6.8.0.163
# via
# -r requirements/base.txt
# edx-django-utils
oauthlib==3.1.1
# via -r requirements/base.txt
packaging==20.9
packaging==21.0
# via
# -r requirements/base.txt
# bleach
path==16.2.0
# via path.py
path.py==12.5.0
# via edx-i18n-tools
path==16.0.0
# via path.py
pbr==5.6.0
# via
# -r requirements/base.txt
Expand All @@ -112,15 +111,15 @@ pycryptodomex==3.10.1
# pyjwkest
pyjwkest==1.4.2
# via -r requirements/base.txt
pymongo==3.11.4
pymongo==3.12.0
# via
# -r requirements/base.txt
# edx-opaque-keys
pyparsing==2.4.7
# via
# -r requirements/base.txt
# packaging
python-dateutil==2.8.1
python-dateutil==2.8.2
# via
# -r requirements/base.txt
# xblock
Expand All @@ -135,11 +134,11 @@ pyyaml==5.4.1
# -r requirements/base.txt
# edx-i18n-tools
# xblock
requests==2.25.1
requests==2.26.0
# via
# -r requirements/base.txt
# pyjwkest
simplejson==3.17.2
simplejson==3.17.3
# via
# -r requirements/base.txt
# xblock-utils
Expand All @@ -160,11 +159,11 @@ stevedore==3.3.0
# -r requirements/base.txt
# edx-django-utils
# edx-opaque-keys
urllib3==1.26.5
urllib3==1.26.6
# via
# -r requirements/base.txt
# requests
web-fragments==1.0.0
web-fragments==1.1.0
# via
# -r requirements/base.txt
# xblock
Expand All @@ -177,12 +176,12 @@ webob==1.8.7
# via
# -r requirements/base.txt
# xblock
xblock-utils==2.1.3
# via -r requirements/base.txt
xblock==1.4.2
xblock==1.5.0
# via
# -r requirements/base.txt
# xblock-utils
xblock-utils==2.2.0
# via -r requirements/base.txt

# The following packages are considered to be unsafe in a requirements file:
# setuptools
6 changes: 3 additions & 3 deletions requirements/pip_tools.txt
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#
# This file is autogenerated by pip-compile
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# make upgrade
#
click==8.0.1
# via pip-tools
pep517==0.10.0
pep517==0.11.0
# via pip-tools
pip-tools==6.2.0
# via -r requirements/pip_tools.in
toml==0.10.2
tomli==1.2.1
# via pep517
wheel==0.36.2
# via pip-tools
Expand Down
Loading

0 comments on commit c9515f2

Please sign in to comment.