Skip to content

Commit

Permalink
Merge branch 'openedx:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
wowkalucky authored May 8, 2023
2 parents e3155c5 + 1008e09 commit 0dcad61
Show file tree
Hide file tree
Showing 10 changed files with 115 additions and 118 deletions.
55 changes: 27 additions & 28 deletions requirements/all.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ asgiref==3.6.0
# -r requirements/dev.txt
# -r requirements/production.txt
# django
astroid==2.15.2
astroid==2.15.4
# via
# -r requirements/dev.txt
# pylint
# pylint-celery
attrs==22.2.0
attrs==23.1.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand All @@ -41,13 +41,13 @@ bleach==6.0.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
bok-choy==1.1.1
bok-choy==2.0.2
# via -r requirements/dev.txt
boto3==1.26.110
boto3==1.26.124
# via
# -r requirements/production.txt
# django-ses
botocore==1.29.110
botocore==1.29.124
# via
# -r requirements/production.txt
# boto3
Expand Down Expand Up @@ -100,9 +100,9 @@ coreschema==0.0.4
# -r requirements/production.txt
# coreapi
# drf-yasg
coverage==7.2.3
coverage==7.2.5
# via -r requirements/dev.txt
cryptography==40.0.1
cryptography==40.0.2
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand Down Expand Up @@ -182,7 +182,7 @@ django-extensions==3.2.1
# via
# -r requirements/dev.txt
# -r requirements/production.txt
django-filter==23.1
django-filter==23.2
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand All @@ -200,7 +200,7 @@ django-rest-swagger==2.2.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
django-ses==3.3.0
django-ses==3.4.1
# via -r requirements/production.txt
django-simple-history==3.0.0
# via
Expand Down Expand Up @@ -269,7 +269,7 @@ edx-auth-backends==4.1.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
edx_credentials_themes @ git+https://github.com/openedx/[email protected].11
edx_credentials_themes @ git+https://github.com/openedx/[email protected].13
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand All @@ -281,15 +281,15 @@ edx-django-sites-extensions==4.0.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
edx-django-utils==5.3.0
edx-django-utils==5.4.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
# edx-drf-extensions
# edx-event-bus-kafka
# edx-rest-api-client
# edx-toggles
edx-drf-extensions==8.4.1
edx-drf-extensions==8.7.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand Down Expand Up @@ -325,7 +325,7 @@ exceptiongroup==1.1.1
# pytest
factory-boy==3.2.1
# via -r requirements/dev.txt
faker==18.4.0
faker==18.6.0
# via
# -r requirements/dev.txt
# factory-boy
Expand All @@ -334,7 +334,7 @@ fastavro==1.7.3
# -r requirements/dev.txt
# -r requirements/production.txt
# openedx-events
filelock==3.11.0
filelock==3.12.0
# via
# -r requirements/dev.txt
# tox
Expand All @@ -359,7 +359,7 @@ idna==3.4
# -r requirements/dev.txt
# -r requirements/production.txt
# requests
importlib-metadata==6.3.0
importlib-metadata==6.6.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand Down Expand Up @@ -454,7 +454,7 @@ openedx-events==7.0.0
# -r requirements/dev.txt
# -r requirements/production.txt
# edx-event-bus-kafka
packaging==23.0
packaging==23.1
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand Down Expand Up @@ -485,7 +485,7 @@ pillow==9.5.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
platformdirs==3.2.0
platformdirs==3.5.0
# via
# -r requirements/dev.txt
# black
Expand All @@ -501,7 +501,7 @@ polib==1.2.0
# -r requirements/dev.txt
# -r requirements/production.txt
# edx-i18n-tools
psutil==5.9.4
psutil==5.9.5
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand All @@ -520,7 +520,7 @@ pycryptodomex==3.17
# -r requirements/dev.txt
# -r requirements/production.txt
# pyjwkest
pygments==2.15.0
pygments==2.15.1
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand All @@ -538,7 +538,7 @@ pyjwt[crypto]==2.6.0
# edx-drf-extensions
# edx-rest-api-client
# social-auth-core
pylint==2.17.2
pylint==2.17.3
# via
# -r requirements/dev.txt
# edx-lint
Expand Down Expand Up @@ -573,7 +573,7 @@ pyrsistent==0.19.3
# via
# -r requirements/dev.txt
# jsonschema
pytest==7.3.0
pytest==7.3.1
# via
# -r requirements/dev.txt
# pytest-django
Expand Down Expand Up @@ -626,7 +626,7 @@ pyyaml==5.4.1
# edx-django-release-util
# edx-i18n-tools
# responses
requests==2.28.2
requests==2.29.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand All @@ -649,7 +649,7 @@ requests-oauthlib==1.3.1
# social-auth-core
responses==0.23.1
# via -r requirements/dev.txt
ruamel-yaml==0.17.21
ruamel-yaml==0.17.22
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand Down Expand Up @@ -689,7 +689,6 @@ six==1.16.0
# -r requirements/production.txt
# analytics-python
# bleach
# bok-choy
# dockerpty
# edx-ace
# edx-auth-backends
Expand All @@ -712,13 +711,13 @@ social-auth-app-django==5.2.0
# -r requirements/dev.txt
# -r requirements/production.txt
# edx-auth-backends
social-auth-core==4.4.1
social-auth-core==4.4.2
# via
# -r requirements/dev.txt
# -r requirements/production.txt
# edx-auth-backends
# social-auth-app-django
sqlparse==0.4.3
sqlparse==0.4.4
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand Down Expand Up @@ -750,7 +749,7 @@ tomli==2.0.1
# pylint
# pytest
# tox
tomlkit==0.11.7
tomlkit==0.11.8
# via
# -r requirements/dev.txt
# pylint
Expand Down Expand Up @@ -783,7 +782,7 @@ urllib3==1.26.15
# requests
# responses
# selenium
virtualenv==20.21.0
virtualenv==20.23.0
# via
# -r requirements/dev.txt
# tox
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ xss-utils


# TODO Install in configuration
git+https://github.com/openedx/[email protected].11#egg=edx_credentials_themes==0.2.11
git+https://github.com/openedx/[email protected].13#egg=edx_credentials_themes==0.2.13
28 changes: 14 additions & 14 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ analytics-python==1.4.0
# -r requirements/base.in
asgiref==3.6.0
# via django
attrs==22.2.0
attrs==23.1.0
# via
# edx-ace
# openedx-events
Expand Down Expand Up @@ -42,7 +42,7 @@ coreschema==0.0.4
# via
# coreapi
# drf-yasg
cryptography==40.0.1
cryptography==40.0.2
# via
# pyjwt
# social-auth-core
Expand Down Expand Up @@ -89,7 +89,7 @@ django-crum==0.7.9
# edx-toggles
django-extensions==3.2.1
# via -r requirements/base.in
django-filter==23.1
django-filter==23.2
# via -r requirements/base.in
django-hijack==2.3.0
# via
Expand Down Expand Up @@ -134,20 +134,20 @@ edx-ace==1.6.1
# via -r requirements/base.in
edx-auth-backends==4.1.0
# via -r requirements/base.in
edx_credentials_themes @ git+https://github.com/openedx/[email protected].11
edx_credentials_themes @ git+https://github.com/openedx/[email protected].13
# via -r requirements/base.in
edx-django-release-util==1.2.0
# via -r requirements/base.in
edx-django-sites-extensions==4.0.0
# via -r requirements/base.in
edx-django-utils==5.3.0
edx-django-utils==5.4.0
# via
# -r requirements/base.in
# edx-drf-extensions
# edx-event-bus-kafka
# edx-rest-api-client
# edx-toggles
edx-drf-extensions==8.4.1
edx-drf-extensions==8.7.0
# via -r requirements/base.in
edx-event-bus-kafka==3.9.6
# via -r requirements/base.in
Expand All @@ -170,7 +170,7 @@ future==0.18.3
# via pyjwkest
idna==3.4
# via requests
importlib-metadata==6.3.0
importlib-metadata==6.6.0
# via markdown
inflection==0.5.1
# via drf-yasg
Expand Down Expand Up @@ -200,7 +200,7 @@ openapi-codec==1.3.2
# via django-rest-swagger
openedx-events==7.0.0
# via edx-event-bus-kafka
packaging==23.0
packaging==23.1
# via drf-yasg
path==16.6.0
# via edx-i18n-tools
Expand All @@ -210,13 +210,13 @@ pillow==9.5.0
# via -r requirements/base.in
polib==1.2.0
# via edx-i18n-tools
psutil==5.9.4
psutil==5.9.5
# via edx-django-utils
pycparser==2.21
# via cffi
pycryptodomex==3.17
# via pyjwkest
pygments==2.15.0
pygments==2.15.1
# via -r requirements/base.in
pyjwkest==1.4.2
# via edx-drf-extensions
Expand Down Expand Up @@ -254,7 +254,7 @@ pyyaml==5.4.1
# code-annotations
# edx-django-release-util
# edx-i18n-tools
requests==2.28.2
requests==2.29.0
# via
# -r requirements/base.in
# analytics-python
Expand All @@ -268,7 +268,7 @@ requests==2.28.2
# social-auth-core
requests-oauthlib==1.3.1
# via social-auth-core
ruamel-yaml==0.17.21
ruamel-yaml==0.17.22
# via drf-yasg
ruamel-yaml-clib==0.2.7
# via ruamel-yaml
Expand Down Expand Up @@ -297,11 +297,11 @@ social-auth-app-django==5.2.0
# via
# -r requirements/base.in
# edx-auth-backends
social-auth-core==4.4.1
social-auth-core==4.4.2
# via
# edx-auth-backends
# social-auth-app-django
sqlparse==0.4.3
sqlparse==0.4.4
# via django
stevedore==5.0.0
# via
Expand Down
Loading

0 comments on commit 0dcad61

Please sign in to comment.