Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/openedx/XBlock into zaeem…
Browse files Browse the repository at this point in the history 
…a-tag_aximprovements_in_pr
  • Loading branch information
@thezaeemaanwar
thezaeemaanwar committed Aug 29, 2023
2 parents cd2d4bf + 6990fd0 commit 84318d1
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 32 deletions.
4 changes: 2 additions & 2 deletions requirements/ci.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ packaging==23.1
# via tox
platformdirs==3.10.0
# via virtualenv
pluggy==1.2.0
pluggy==1.3.0
# via tox
py==1.11.0
# via tox
Expand All @@ -29,7 +29,7 @@ tox==3.28.0
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/ci.in
# tox-battery
tox-battery==0.6.1
tox-battery==0.6.2
# via -r requirements/ci.in
virtualenv==20.24.3
# via tox
22 changes: 11 additions & 11 deletions requirements/dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ attrs==23.1.0
# via
# -r requirements/test.txt
# hypothesis
boto3==1.28.25
boto3==1.28.35
# via
# -r requirements/test.txt
# fs-s3fs
botocore==1.31.25
botocore==1.31.35
# via
# -r requirements/test.txt
# boto3
Expand All @@ -34,7 +34,7 @@ build==0.10.0
# via
# -r requirements/pip-tools.txt
# pip-tools
click==8.1.6
click==8.1.7
# via
# -r requirements/pip-tools.txt
# -r requirements/test.txt
Expand Down Expand Up @@ -77,7 +77,7 @@ django==2.2.28
# openedx-django-pyfs
edx-lint==5.3.4
# via -r requirements/test.txt
exceptiongroup==1.1.2
exceptiongroup==1.1.3
# via
# -r requirements/test.txt
# hypothesis
Expand All @@ -97,7 +97,7 @@ fs-s3fs==1.1.1
# via
# -r requirements/test.txt
# openedx-django-pyfs
hypothesis==6.82.4
hypothesis==6.82.6
# via -r requirements/test.txt
inflect==7.0.0
# via
Expand Down Expand Up @@ -168,7 +168,7 @@ platformdirs==3.10.0
# -r requirements/test.txt
# pylint
# virtualenv
pluggy==1.2.0
pluggy==1.3.0
# via
# -r requirements/ci.txt
# -r requirements/test.txt
Expand All @@ -182,11 +182,11 @@ py==1.11.0
# tox
pycodestyle==2.11.0
# via -r requirements/test.txt
pydantic==2.1.1
pydantic==2.3.0
# via
# -r requirements/test.txt
# inflect
pydantic-core==2.4.0
pydantic-core==2.6.3
# via
# -r requirements/test.txt
# pydantic
Expand Down Expand Up @@ -243,7 +243,7 @@ pyyaml==6.0.1
# via
# -r requirements/test.txt
# code-annotations
s3transfer==0.6.1
s3transfer==0.6.2
# via
# -r requirements/test.txt
# boto3
Expand Down Expand Up @@ -296,7 +296,7 @@ tox==3.28.0
# -r requirements/ci.txt
# -r requirements/test.txt
# tox-battery
tox-battery==0.6.1
tox-battery==0.6.2
# via -r requirements/ci.txt
typing-extensions==4.7.1
# via
Expand All @@ -320,7 +320,7 @@ web-fragments==2.1.0
# via -r requirements/test.txt
webob==1.8.7
# via -r requirements/test.txt
wheel==0.41.1
wheel==0.41.2
# via
# -r requirements/pip-tools.txt
# pip-tools
Expand Down
6 changes: 3 additions & 3 deletions requirements/django.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ appdirs==1.4.4
# via
# -r requirements/base.txt
# fs
boto3==1.28.25
boto3==1.28.35
# via fs-s3fs
botocore==1.31.25
botocore==1.31.35
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -48,7 +48,7 @@ pytz==2023.3
# django
pyyaml==6.0.1
# via -r requirements/base.txt
s3transfer==0.6.1
s3transfer==0.6.2
# via boto3
simplejson==3.19.1
# via -r requirements/base.txt
Expand Down
6 changes: 3 additions & 3 deletions requirements/doc.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ babel==2.12.1
# sphinx
beautifulsoup4==4.12.2
# via pydata-sphinx-theme
boto3==1.28.25
boto3==1.28.35
# via
# -r requirements/django.txt
# fs-s3fs
botocore==1.31.25
botocore==1.31.35
# via
# -r requirements/django.txt
# boto3
Expand Down Expand Up @@ -98,7 +98,7 @@ pyyaml==6.0.1
# via -r requirements/django.txt
requests==2.31.0
# via sphinx
s3transfer==0.6.1
s3transfer==0.6.2
# via
# -r requirements/django.txt
# boto3
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip-tools.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
build==0.10.0
# via pip-tools
click==8.1.6
click==8.1.7
# via pip-tools
packaging==23.1
# via build
Expand All @@ -19,7 +19,7 @@ tomli==2.0.1
# build
# pip-tools
# pyproject-hooks
wheel==0.41.1
wheel==0.41.2
# via pip-tools

# The following packages are considered to be unsafe in a requirements file:
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
#
# make upgrade
#
wheel==0.41.1
wheel==0.41.2
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==23.2.1
# via -r requirements/pip.in
setuptools==68.0.0
setuptools==68.1.2
# via -r requirements/pip.in
18 changes: 9 additions & 9 deletions requirements/test.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ astroid==2.15.6
# pylint-celery
attrs==23.1.0
# via hypothesis
boto3==1.28.25
boto3==1.28.35
# via
# -r requirements/django.txt
# fs-s3fs
botocore==1.31.25
botocore==1.31.35
# via
# -r requirements/django.txt
# boto3
# s3transfer
click==8.1.6
click==8.1.7
# via
# click-log
# code-annotations
Expand Down Expand Up @@ -55,7 +55,7 @@ distlib==0.3.7
# openedx-django-pyfs
edx-lint==5.3.4
# via -r requirements/test.in
exceptiongroup==1.1.2
exceptiongroup==1.1.3
# via
# hypothesis
# pytest
Expand All @@ -72,7 +72,7 @@ fs-s3fs==1.1.1
# via
# -r requirements/django.txt
# openedx-django-pyfs
hypothesis==6.82.4
hypothesis==6.82.6
# via -r requirements/test.in
inflect==7.0.0
# via jinja2-pluralize
Expand Down Expand Up @@ -120,7 +120,7 @@ platformdirs==3.10.0
# via
# pylint
# virtualenv
pluggy==1.2.0
pluggy==1.3.0
# via
# diff-cover
# pytest
Expand All @@ -129,9 +129,9 @@ py==1.11.0
# via tox
pycodestyle==2.11.0
# via -r requirements/test.in
pydantic==2.1.1
pydantic==2.3.0
# via inflect
pydantic-core==2.4.0
pydantic-core==2.6.3
# via pydantic
pygments==2.16.1
# via diff-cover
Expand Down Expand Up @@ -173,7 +173,7 @@ pyyaml==6.0.1
# via
# -r requirements/django.txt
# code-annotations
s3transfer==0.6.1
s3transfer==0.6.2
# via
# -r requirements/django.txt
# boto3
Expand Down

0 comments on commit 84318d1

Please sign in to comment.