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 8, 2024
2 parents f5ed243 + e8883bd commit 2916669
Show file tree
Hide file tree
Showing 7 changed files with 148 additions and 147 deletions.
40 changes: 21 additions & 19 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
#
# make upgrade
#
annotated-types==0.6.0
# via pydantic
anyascii==0.3.2
# via wagtail
asgiref==3.8.1
Expand Down Expand Up @@ -111,16 +109,16 @@ drf-yasg==1.21.7
# edx-api-doc-tools
edx-api-doc-tools==1.7.0
# via -r requirements/base.in
edx-auth-backends==4.2.0
edx-auth-backends==4.3.0
# via -r requirements/base.in
edx-django-release-util==1.3.0
edx-django-release-util==1.4.0
# via -r requirements/base.in
edx-django-utils==5.11.0
edx-django-utils==5.12.0
# via
# -r requirements/base.in
# edx-drf-extensions
# edx-rest-api-client
edx-drf-extensions==10.2.0
edx-drf-extensions==10.3.0
# via -r requirements/base.in
edx-opaque-keys==2.5.1
# via edx-drf-extensions
Expand All @@ -136,7 +134,11 @@ html5lib==1.1
# via wagtail
idna==3.6
# via requests
inflect==7.0.0
importlib-metadata==6.11.0
# via
# -c requirements/common_constraints.txt
# typeguard
inflect==7.2.0
# via -r requirements/base.in
inflection==0.5.1
# via drf-yasg
Expand All @@ -150,9 +152,11 @@ laces==0.1.1
# via wagtail
mock==5.1.0
# via -r requirements/base.in
more-itertools==10.2.0
# via inflect
mysqlclient==2.2.4
# via -r requirements/base.in
newrelic==9.7.1
newrelic==9.8.0
# via edx-django-utils
oauthlib==3.2.2
# via
Expand All @@ -164,20 +168,16 @@ packaging==24.0
# via drf-yasg
pbr==6.0.0
# via stevedore
pillow==10.2.0
pillow==10.3.0
# via
# pillow-heif
# wagtail
pillow-heif==0.15.0
pillow-heif==0.16.0
# via willow
psutil==5.9.8
# via edx-django-utils
pycparser==2.21
pycparser==2.22
# via cffi
pydantic==2.6.4
# via inflect
pydantic-core==2.16.3
# via pydantic
pyjwt[crypto]==2.8.0
# via
# drf-jwt
Expand Down Expand Up @@ -247,14 +247,14 @@ stevedore==5.2.0
# edx-opaque-keys
telepath==0.3.1
# via wagtail
typeguard==4.2.1
# via inflect
typing-extensions==4.10.0
# via
# annotated-types
# asgiref
# edx-opaque-keys
# inflect
# pydantic
# pydantic-core
# typeguard
uritemplate==4.1.1
# via drf-yasg
urllib3==1.26.18
Expand All @@ -270,4 +270,6 @@ willow[heif]==1.8.0
# wagtail
# willow
zipp==3.18.1
# via -r requirements/base.in
# via
# -r requirements/base.in
# importlib-metadata
53 changes: 27 additions & 26 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
#
# make upgrade
#
annotated-types==0.6.0
# via
# -r requirements/quality.txt
# pydantic
anyascii==0.3.2
# via
# -r requirements/quality.txt
Expand Down Expand Up @@ -194,16 +190,16 @@ drf-yasg==1.21.7
# edx-api-doc-tools
edx-api-doc-tools==1.7.0
# via -r requirements/quality.txt
edx-auth-backends==4.2.0
edx-auth-backends==4.3.0
# via -r requirements/quality.txt
edx-django-release-util==1.3.0
edx-django-release-util==1.4.0
# via -r requirements/quality.txt
edx-django-utils==5.11.0
edx-django-utils==5.12.0
# via
# -r requirements/quality.txt
# edx-drf-extensions
# edx-rest-api-client
edx-drf-extensions==10.2.0
edx-drf-extensions==10.3.0
# via -r requirements/quality.txt
edx-i18n-tools==1.3.0
# via -r requirements/dev.in
Expand Down Expand Up @@ -248,7 +244,12 @@ idna==3.6
# via
# -r requirements/quality.txt
# requests
inflect==7.0.0
importlib-metadata==6.11.0
# via
# -c requirements/common_constraints.txt
# -r requirements/quality.txt
# typeguard
inflect==7.2.0
# via -r requirements/quality.txt
inflection==0.5.1
# via
Expand Down Expand Up @@ -280,7 +281,7 @@ laces==0.1.1
# via
# -r requirements/quality.txt
# wagtail
lxml==5.1.0
lxml==5.2.0
# via edx-i18n-tools
markupsafe==2.1.5
# via
Expand All @@ -292,9 +293,13 @@ mccabe==0.7.0
# pylint
mock==5.1.0
# via -r requirements/quality.txt
more-itertools==10.2.0
# via
# -r requirements/quality.txt
# inflect
mysqlclient==2.2.4
# via -r requirements/quality.txt
newrelic==9.7.1
newrelic==9.8.0
# via
# -r requirements/quality.txt
# edx-django-utils
Expand All @@ -320,12 +325,12 @@ pbr==6.0.0
# via
# -r requirements/quality.txt
# stevedore
pillow==10.2.0
pillow==10.3.0
# via
# -r requirements/quality.txt
# pillow-heif
# wagtail
pillow-heif==0.15.0
pillow-heif==0.16.0
# via
# -r requirements/quality.txt
# willow
Expand All @@ -349,18 +354,10 @@ psutil==5.9.8
# edx-django-utils
pycodestyle==2.11.1
# via -r requirements/quality.txt
pycparser==2.21
pycparser==2.22
# via
# -r requirements/quality.txt
# cffi
pydantic==2.6.4
# via
# -r requirements/quality.txt
# inflect
pydantic-core==2.16.3
# via
# -r requirements/quality.txt
# pydantic
pydocstyle==6.3.0
# via -r requirements/quality.txt
pygments==2.17.2
Expand Down Expand Up @@ -524,18 +521,20 @@ tomlkit==0.12.4
# pylint
tox==4.14.2
# via -r requirements/quality.txt
typeguard==4.2.1
# via
# -r requirements/quality.txt
# inflect
typing-extensions==4.10.0
# via
# -r requirements/quality.txt
# annotated-types
# asgiref
# astroid
# edx-opaque-keys
# faker
# inflect
# pydantic
# pydantic-core
# pylint
# typeguard
uritemplate==4.1.1
# via
# -r requirements/quality.txt
Expand All @@ -560,4 +559,6 @@ willow[heif]==1.8.0
# -r requirements/quality.txt
# wagtail
zipp==3.18.1
# via -r requirements/quality.txt
# via
# -r requirements/quality.txt
# importlib-metadata
49 changes: 23 additions & 26 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
#
alabaster==0.7.13
# via sphinx
annotated-types==0.6.0
# via
# -r requirements/test.txt
# pydantic
anyascii==0.3.2
# via
# -r requirements/test.txt
Expand Down Expand Up @@ -196,16 +192,16 @@ drf-yasg==1.21.7
# edx-api-doc-tools
edx-api-doc-tools==1.7.0
# via -r requirements/test.txt
edx-auth-backends==4.2.0
edx-auth-backends==4.3.0
# via -r requirements/test.txt
edx-django-release-util==1.3.0
edx-django-release-util==1.4.0
# via -r requirements/test.txt
edx-django-utils==5.11.0
edx-django-utils==5.12.0
# via
# -r requirements/test.txt
# edx-drf-extensions
# edx-rest-api-client
edx-drf-extensions==10.2.0
edx-drf-extensions==10.3.0
# via -r requirements/test.txt
edx-lint==5.3.6
# via -r requirements/test.txt
Expand Down Expand Up @@ -250,9 +246,12 @@ idna==3.6
# requests
imagesize==1.4.1
# via sphinx
importlib-metadata==7.1.0
# via sphinx
inflect==7.0.0
importlib-metadata==6.11.0
# via
# -r requirements/test.txt
# sphinx
# typeguard
inflect==7.2.0
# via -r requirements/test.txt
inflection==0.5.1
# via
Expand Down Expand Up @@ -294,9 +293,13 @@ mccabe==0.7.0
# pylint
mock==5.1.0
# via -r requirements/test.txt
more-itertools==10.2.0
# via
# -r requirements/test.txt
# inflect
mysqlclient==2.2.4
# via -r requirements/test.txt
newrelic==9.7.1
newrelic==9.8.0
# via
# -r requirements/test.txt
# edx-django-utils
Expand All @@ -323,12 +326,12 @@ pbr==6.0.0
# via
# -r requirements/test.txt
# stevedore
pillow==10.2.0
pillow==10.3.0
# via
# -r requirements/test.txt
# pillow-heif
# wagtail
pillow-heif==0.15.0
pillow-heif==0.16.0
# via
# -r requirements/test.txt
# willow
Expand All @@ -347,18 +350,10 @@ psutil==5.9.8
# via
# -r requirements/test.txt
# edx-django-utils
pycparser==2.21
pycparser==2.22
# via
# -r requirements/test.txt
# cffi
pydantic==2.6.4
# via
# -r requirements/test.txt
# inflect
pydantic-core==2.16.3
# via
# -r requirements/test.txt
# pydantic
pygments==2.17.2
# via
# doc8
Expand Down Expand Up @@ -544,18 +539,20 @@ tomlkit==0.12.4
# pylint
tox==4.14.2
# via -r requirements/test.txt
typeguard==4.2.1
# via
# -r requirements/test.txt
# inflect
typing-extensions==4.10.0
# via
# -r requirements/test.txt
# annotated-types
# asgiref
# astroid
# edx-opaque-keys
# faker
# inflect
# pydantic
# pydantic-core
# pylint
# typeguard
uritemplate==4.1.1
# via
# -r requirements/test.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
build==1.1.1
build==1.2.1
# via pip-tools
click==8.1.7
# via pip-tools
Expand Down
Loading

0 comments on commit 2916669

Please sign in to comment.