Skip to content

Commit

Permalink
Merge branch 'master' into python-support
Browse files Browse the repository at this point in the history
  • Loading branch information
awais786 authored Apr 25, 2024
2 parents c21e16a + a043b4e commit d3be190
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 42 deletions.
26 changes: 15 additions & 11 deletions requirements/all.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ bleach==6.1.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
boto3==1.34.85
boto3==1.34.89
# via
# -r requirements/production.txt
# django-ses
botocore==1.34.85
botocore==1.34.89
# via
# -r requirements/production.txt
# boto3
Expand Down Expand Up @@ -199,7 +199,7 @@ django-rest-swagger==2.2.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
django-ses==3.6.0
django-ses==4.0.0
# via -r requirements/production.txt
django-simple-history==3.5.0
# via
Expand All @@ -209,7 +209,7 @@ django-sortedm2m==3.1.1
# via
# -r requirements/dev.txt
# -r requirements/production.txt
django-statici18n==2.4.0
django-statici18n==2.5.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand Down Expand Up @@ -261,7 +261,7 @@ edx-django-release-util==1.4.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
edx-django-sites-extensions==4.0.2
edx-django-sites-extensions==4.2.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand Down Expand Up @@ -289,7 +289,7 @@ edx-i18n-tools==1.5.0
# edx-credentials-themes
edx-lint==5.3.6
# via -r requirements/dev.txt
edx-opaque-keys[django]==2.5.1
edx-opaque-keys[django]==2.8.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand All @@ -304,7 +304,7 @@ edx-toggles==5.2.0
# -r requirements/dev.txt
# -r requirements/production.txt
# edx-event-bus-kafka
exceptiongroup==1.2.0
exceptiongroup==1.2.1
# via
# -r requirements/dev.txt
# pytest
Expand Down Expand Up @@ -406,7 +406,7 @@ mysqlclient==2.2.4
# via
# -r requirements/dev.txt
# -r requirements/production.txt
newrelic==9.8.0
newrelic==9.9.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand All @@ -428,7 +428,7 @@ openedx-atlas==0.6.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
openedx-events==9.9.1
openedx-events==9.9.2
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand Down Expand Up @@ -468,7 +468,7 @@ platformdirs==4.2.0
# pylint
# tox
# virtualenv
pluggy==1.4.0
pluggy==1.5.0
# via
# -r requirements/dev.txt
# pytest
Expand Down Expand Up @@ -733,7 +733,11 @@ webencodings==0.5.1
# -r requirements/dev.txt
# -r requirements/production.txt
# bleach
xss-utils==0.5.0
websocket-client==0.59.0
# via
# -r requirements/dev.txt
# docker-compose
xss-utils==0.6.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand Down
12 changes: 6 additions & 6 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ django-simple-history==3.5.0
# via -r requirements/base.in
django-sortedm2m==3.1.1
# via -r requirements/base.in
django-statici18n==2.4.0
django-statici18n==2.5.0
# via -r requirements/base.in
django-storages==1.14.2
# via -r requirements/base.in
Expand Down Expand Up @@ -132,7 +132,7 @@ edx-credentials-themes @ git+https://github.com/openedx/credentials-themes.git@0
# via -r requirements/base.in
edx-django-release-util==1.4.0
# via -r requirements/base.in
edx-django-sites-extensions==4.0.2
edx-django-sites-extensions==4.2.0
# via -r requirements/base.in
edx-django-utils==5.12.0
# via
Expand All @@ -148,7 +148,7 @@ edx-event-bus-kafka==5.7.0
# via -r requirements/base.in
edx-i18n-tools==1.5.0
# via edx-credentials-themes
edx-opaque-keys[django]==2.5.1
edx-opaque-keys[django]==2.8.0
# via
# -r requirements/base.in
# edx-drf-extensions
Expand Down Expand Up @@ -188,7 +188,7 @@ markupsafe==2.1.5
# via jinja2
mysqlclient==2.2.4
# via -r requirements/base.in
newrelic==9.8.0
newrelic==9.9.0
# via
# -r requirements/base.in
# edx-django-utils
Expand All @@ -200,7 +200,7 @@ openapi-codec==1.3.2
# via django-rest-swagger
openedx-atlas==0.6.0
# via -r requirements/base.in
openedx-events==9.9.1
openedx-events==9.9.2
# via edx-event-bus-kafka
packaging==24.0
# via drf-yasg
Expand Down Expand Up @@ -321,7 +321,7 @@ urllib3==1.26.18
# requests
webencodings==0.5.1
# via bleach
xss-utils==0.5.0
xss-utils==0.6.0
# via -r requirements/base.in
zipp==3.18.1
# via importlib-metadata
18 changes: 10 additions & 8 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ django-simple-history==3.5.0
# via -r requirements/test.txt
django-sortedm2m==3.1.1
# via -r requirements/test.txt
django-statici18n==2.4.0
django-statici18n==2.5.0
# via -r requirements/test.txt
django-storages==1.14.2
# via -r requirements/test.txt
Expand Down Expand Up @@ -196,7 +196,7 @@ edx-credentials-themes @ git+https://github.com/openedx/credentials-themes.git@0
# via -r requirements/test.txt
edx-django-release-util==1.4.0
# via -r requirements/test.txt
edx-django-sites-extensions==4.0.2
edx-django-sites-extensions==4.2.0
# via -r requirements/test.txt
edx-django-utils==5.12.0
# via
Expand All @@ -217,7 +217,7 @@ edx-i18n-tools==1.5.0
# edx-credentials-themes
edx-lint==5.3.6
# via -r requirements/test.txt
edx-opaque-keys[django]==2.5.1
edx-opaque-keys[django]==2.8.0
# via
# -r requirements/test.txt
# edx-drf-extensions
Expand All @@ -228,7 +228,7 @@ edx-toggles==5.2.0
# via
# -r requirements/test.txt
# edx-event-bus-kafka
exceptiongroup==1.2.0
exceptiongroup==1.2.1
# via
# -r requirements/test.txt
# pytest
Expand Down Expand Up @@ -303,7 +303,7 @@ mypy-extensions==1.0.0
# black
mysqlclient==2.2.4
# via -r requirements/test.txt
newrelic==9.8.0
newrelic==9.9.0
# via
# -r requirements/test.txt
# edx-django-utils
Expand All @@ -318,7 +318,7 @@ openapi-codec==1.3.2
# django-rest-swagger
openedx-atlas==0.6.0
# via -r requirements/test.txt
openedx-events==9.9.1
openedx-events==9.9.2
# via
# -r requirements/test.txt
# edx-event-bus-kafka
Expand Down Expand Up @@ -351,7 +351,7 @@ platformdirs==4.2.0
# pylint
# tox
# virtualenv
pluggy==1.4.0
pluggy==1.5.0
# via
# -r requirements/test.txt
# pytest
Expand Down Expand Up @@ -571,7 +571,9 @@ webencodings==0.5.1
# via
# -r requirements/test.txt
# bleach
xss-utils==0.5.0
websocket-client==0.59.0
# via docker-compose
xss-utils==0.6.0
# via -r requirements/test.txt
zipp==3.18.1
# via
Expand Down
18 changes: 9 additions & 9 deletions requirements/production.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9"
# djangorestframework
bleach==6.1.0
# via -r requirements/base.txt
boto3==1.34.85
boto3==1.34.89
# via django-ses
botocore==1.34.85
botocore==1.34.89
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -124,13 +124,13 @@ django-ratelimit==4.1.0
# via -r requirements/base.txt
django-rest-swagger==2.2.0
# via -r requirements/base.txt
django-ses==3.6.0
django-ses==4.0.0
# via -r requirements/production.in
django-simple-history==3.5.0
# via -r requirements/base.txt
django-sortedm2m==3.1.1
# via -r requirements/base.txt
django-statici18n==2.4.0
django-statici18n==2.5.0
# via -r requirements/base.txt
django-storages==1.14.2
# via -r requirements/base.txt
Expand Down Expand Up @@ -163,7 +163,7 @@ edx-credentials-themes @ git+https://github.com/openedx/credentials-themes.git@0
# via -r requirements/base.txt
edx-django-release-util==1.4.0
# via -r requirements/base.txt
edx-django-sites-extensions==4.0.2
edx-django-sites-extensions==4.2.0
# via -r requirements/base.txt
edx-django-utils==5.12.0
# via
Expand All @@ -181,7 +181,7 @@ edx-i18n-tools==1.5.0
# via
# -r requirements/base.txt
# edx-credentials-themes
edx-opaque-keys[django]==2.5.1
edx-opaque-keys[django]==2.8.0
# via
# -r requirements/base.txt
# edx-drf-extensions
Expand Down Expand Up @@ -244,7 +244,7 @@ markupsafe==2.1.5
# jinja2
mysqlclient==2.2.4
# via -r requirements/base.txt
newrelic==9.8.0
newrelic==9.9.0
# via
# -r requirements/base.txt
# -r requirements/production.in
Expand All @@ -262,7 +262,7 @@ openapi-codec==1.3.2
# django-rest-swagger
openedx-atlas==0.6.0
# via -r requirements/base.txt
openedx-events==9.9.1
openedx-events==9.9.2
# via
# -r requirements/base.txt
# edx-event-bus-kafka
Expand Down Expand Up @@ -438,7 +438,7 @@ webencodings==0.5.1
# via
# -r requirements/base.txt
# bleach
xss-utils==0.5.0
xss-utils==0.6.0
# via -r requirements/base.txt
zipp==3.18.1
# via
Expand Down
16 changes: 8 additions & 8 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ django-simple-history==3.5.0
# via -r requirements/base.txt
django-sortedm2m==3.1.1
# via -r requirements/base.txt
django-statici18n==2.4.0
django-statici18n==2.5.0
# via -r requirements/base.txt
django-storages==1.14.2
# via -r requirements/base.txt
Expand Down Expand Up @@ -180,7 +180,7 @@ edx-credentials-themes @ git+https://github.com/openedx/credentials-themes.git@0
# via -r requirements/base.txt
edx-django-release-util==1.4.0
# via -r requirements/base.txt
edx-django-sites-extensions==4.0.2
edx-django-sites-extensions==4.2.0
# via -r requirements/base.txt
edx-django-utils==5.12.0
# via
Expand All @@ -200,7 +200,7 @@ edx-i18n-tools==1.5.0
# edx-credentials-themes
edx-lint==5.3.6
# via -r requirements/test.in
edx-opaque-keys[django]==2.5.1
edx-opaque-keys[django]==2.8.0
# via
# -r requirements/base.txt
# edx-drf-extensions
Expand All @@ -211,7 +211,7 @@ edx-toggles==5.2.0
# via
# -r requirements/base.txt
# edx-event-bus-kafka
exceptiongroup==1.2.0
exceptiongroup==1.2.1
# via pytest
factory-boy==3.3.0
# via -r requirements/test.in
Expand Down Expand Up @@ -275,7 +275,7 @@ mypy-extensions==1.0.0
# via black
mysqlclient==2.2.4
# via -r requirements/base.txt
newrelic==9.8.0
newrelic==9.9.0
# via
# -r requirements/base.txt
# edx-django-utils
Expand All @@ -290,7 +290,7 @@ openapi-codec==1.3.2
# django-rest-swagger
openedx-atlas==0.6.0
# via -r requirements/base.txt
openedx-events==9.9.1
openedx-events==9.9.2
# via
# -r requirements/base.txt
# edx-event-bus-kafka
Expand Down Expand Up @@ -320,7 +320,7 @@ platformdirs==4.2.0
# pylint
# tox
# virtualenv
pluggy==1.4.0
pluggy==1.5.0
# via
# pytest
# tox
Expand Down Expand Up @@ -523,7 +523,7 @@ webencodings==0.5.1
# via
# -r requirements/base.txt
# bleach
xss-utils==0.5.0
xss-utils==0.6.0
# via -r requirements/base.txt
zipp==3.18.1
# via
Expand Down

0 comments on commit d3be190

Please sign in to comment.