fix: resolve conflicts

openedx · Jul 6, 2023 · 754f8bb · 754f8bb
2 parents d5f2090 + c6131e1
commit 754f8bb
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 15 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -48,7 +48,7 @@ sqlparse==0.4.4
     # via django
 tinycss2==1.1.1
     # via bleach
-typing-extensions==4.6.3
+typing-extensions==4.7.1
     # via asgiref
 web-fragments==2.0.0
     # via

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -37,12 +37,12 @@ bok-choy==0.7.1
     # via
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt
-boto3==1.26.160
+boto3==1.26.165
     # via
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt
     #   fs-s3fs
-botocore==1.29.160
+botocore==1.29.165
     # via
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt
@@ -250,12 +250,12 @@ pbr==5.11.1
     # via
     #   -r requirements/quality.txt
     #   stevedore
-pillow==9.5.0
+pillow==10.0.0
     # via
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt
     #   needle
-pip-tools==6.13.0
+pip-tools==6.14.0
     # via -r requirements/pip-tools.txt
 platformdirs==3.8.0
     # via
@@ -408,6 +408,7 @@ tomli==2.0.1
     #   -r requirements/workbench.txt
     #   build
     #   coverage
+    #   pip-tools
     #   pyproject-hooks
     #   pytest
     #   tox
@@ -417,7 +418,7 @@ tox==3.28.0
     #   tox-battery
 tox-battery==0.6.1
     # via -r requirements/ci.txt
-typing-extensions==4.6.3
+typing-extensions==4.7.1
     # via
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt

diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
@@ -10,13 +10,14 @@ click==8.1.3
     # via pip-tools
 packaging==23.1
     # via build
-pip-tools==6.13.0
+pip-tools==6.14.0
     # via -r requirements/pip-tools.in
 pyproject-hooks==1.0.0
     # via build
 tomli==2.0.1
     # via
     #   build
+    #   pip-tools
     #   pyproject-hooks
 wheel==0.40.0
     # via pip-tools

diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -176,7 +176,7 @@ path==16.6.0
     #   edx-i18n-tools
 pbr==5.11.1
     # via stevedore
-pillow==9.5.0
+pillow==10.0.0
     # via
     #   -r requirements/test.txt
     #   needle
@@ -289,7 +289,7 @@ tomli==2.0.1
     #   -r requirements/test.txt
     #   coverage
     #   pytest
-typing-extensions==4.6.3
+typing-extensions==4.7.1
     # via
     #   -r requirements/test.txt
     #   asgiref

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -114,7 +114,7 @@ packaging==23.1
     # via pytest
 path==16.6.0
     # via edx-i18n-tools
-pillow==9.5.0
+pillow==10.0.0
     # via needle
 pluggy==1.2.0
     # via pytest
@@ -187,7 +187,7 @@ tomli==2.0.1
     # via
     #   coverage
     #   pytest
-typing-extensions==4.6.3
+typing-extensions==4.7.1
     # via
     #   -r requirements/base.txt
     #   asgiref

diff --git a/requirements/workbench.txt b/requirements/workbench.txt
@@ -24,11 +24,11 @@ bleach[css]==6.0.0
     # via -r requirements/test.txt
 bok-choy==0.7.1
     # via -r requirements/test.txt
-boto3==1.26.160
+boto3==1.26.165
     # via
     #   -r requirements/test.txt
     #   fs-s3fs
-botocore==1.29.160
+botocore==1.29.165
     # via
     #   -r requirements/test.txt
     #   boto3
@@ -157,7 +157,7 @@ path==16.6.0
     # via
     #   -r requirements/test.txt
     #   edx-i18n-tools
-pillow==9.5.0
+pillow==10.0.0
     # via
     #   -r requirements/test.txt
     #   needle
@@ -250,7 +250,7 @@ tomli==2.0.1
     #   -r requirements/test.txt
     #   coverage
     #   pytest
-typing-extensions==4.6.3
+typing-extensions==4.7.1
     # via
     #   -r requirements/test.txt
     #   asgiref