From b29c8adc3ed7283122d544a4adf80b4d52ffa361 Mon Sep 17 00:00:00 2001
From: Navin Karkera <navin@opencraft.com>
Date: Tue, 30 Jul 2024 19:47:28 +0530
Subject: [PATCH] chore: upgrade deps

---
 requirements/base.txt        | 18 +++++++------
 requirements/ci.txt          | 12 +++++----
 requirements/constraints.txt |  7 +++--
 requirements/dev.txt         | 51 ++++++++++++++++++++----------------
 requirements/pip.txt         |  4 +--
 requirements/quality.txt     | 39 ++++++++++++++-------------
 requirements/test.txt        | 25 +++++++++---------
 7 files changed, 86 insertions(+), 70 deletions(-)

diff --git a/requirements/base.txt b/requirements/base.txt
index 91495d7..bd8c888 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -8,13 +8,13 @@ appdirs==1.4.4
     # via fs
 asgiref==3.8.1
     # via django
-boto3==1.34.130
+boto3==1.34.150
     # via fs-s3fs
-botocore==1.34.130
+botocore==1.34.150
     # via
     #   boto3
     #   s3transfer
-django==4.2.13
+django==4.2.14
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   django-appconf
@@ -55,7 +55,7 @@ pytz==2024.1
     # via xblock
 pyyaml==6.0.1
     # via xblock
-s3transfer==0.10.1
+s3transfer==0.10.2
     # via boto3
 simplejson==3.19.2
     # via xblock
@@ -64,15 +64,17 @@ six==1.16.0
     #   fs
     #   fs-s3fs
     #   python-dateutil
-sqlparse==0.5.0
+sqlparse==0.5.1
     # via django
-urllib3==2.2.2
-    # via botocore
+urllib3==2.2.2 ; python_version > "3.10"
+    # via
+    #   -c requirements/constraints.txt
+    #   botocore
 web-fragments==2.2.0
     # via xblock
 webob==1.8.7
     # via xblock
-xblock[django]==4.0.1
+xblock[django]==5.0.0
     # via -r requirements/base.in
 
 # The following packages are considered to be unsafe in a requirements file:
diff --git a/requirements/ci.txt b/requirements/ci.txt
index d1996e4..ba61bd3 100644
--- a/requirements/ci.txt
+++ b/requirements/ci.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-cachetools==5.3.3
+cachetools==5.4.0
     # via tox
 chardet==5.2.0
     # via tox
@@ -12,7 +12,7 @@ colorama==0.4.6
     # via tox
 distlib==0.3.8
     # via virtualenv
-filelock==3.15.3
+filelock==3.15.4
     # via
     #   tox
     #   virtualenv
@@ -26,9 +26,11 @@ platformdirs==4.2.2
     #   virtualenv
 pluggy==1.5.0
     # via tox
-pyproject-api==1.6.1
+pyproject-api==1.7.1
     # via tox
 tox==4.15.1
-    # via -r requirements/ci.in
-virtualenv==20.26.2
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/ci.in
+virtualenv==20.26.3
     # via tox
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 5441db0..8066fe5 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -11,5 +11,8 @@
 # Common constraints for edx repos
 -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
 
-# For python greater than or equal to 3.9 backports.zoneinfo causing failures
-backports.zoneinfo; python_version<"3.9"
+# For python lesser than or equal to 3.10 urllib3<1.27 is required by botocore
+urllib3<1.27; python_version<"3.10"
+urllib3; python_version>"3.10"
+# For python_version greater than or equal to 3.11, tox seems to be using Path.abspath which is removed from py3.11
+tox<=4.15.1
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 99fde7c..6509b7f 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -16,7 +16,7 @@ asgiref==3.8.1
     # via
     #   -r requirements/quality.txt
     #   django
-astroid==3.2.2
+astroid==3.2.4
     # via
     #   -r requirements/quality.txt
     #   pylint
@@ -25,11 +25,11 @@ binaryornot==0.4.4
     # via
     #   -r requirements/quality.txt
     #   cookiecutter
-boto3==1.34.130
+boto3==1.34.150
     # via
     #   -r requirements/quality.txt
     #   fs-s3fs
-botocore==1.34.130
+botocore==1.34.150
     # via
     #   -r requirements/quality.txt
     #   boto3
@@ -38,11 +38,11 @@ build==1.2.1
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
-cachetools==5.3.3
+cachetools==5.4.0
     # via
     #   -r requirements/ci.txt
     #   tox
-certifi==2024.6.2
+certifi==2024.7.4
     # via
     #   -r requirements/quality.txt
     #   requests
@@ -81,7 +81,7 @@ cookiecutter==2.6.0
     # via
     #   -r requirements/quality.txt
     #   xblock-sdk
-coverage[toml]==7.5.3
+coverage[toml]==7.6.0
     # via
     #   -r requirements/quality.txt
     #   pytest-cov
@@ -95,7 +95,7 @@ distlib==0.3.8
     # via
     #   -r requirements/ci.txt
     #   virtualenv
-django==4.2.13
+django==4.2.14
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/quality.txt
@@ -110,11 +110,11 @@ django-appconf==1.0.6
     #   django-statici18n
 django-statici18n==2.5.0
     # via -r requirements/quality.txt
-edx-i18n-tools==1.6.0
+edx-i18n-tools==1.6.1
     # via -r requirements/quality.txt
-edx-lint==5.3.6
+edx-lint==5.3.7
     # via -r requirements/quality.txt
-filelock==3.15.3
+filelock==3.15.4
     # via
     #   -r requirements/ci.txt
     #   tox
@@ -163,8 +163,10 @@ lxml[html-clean]==5.2.2
     #   lxml-html-clean
     #   xblock
     #   xblock-sdk
-lxml-html-clean==0.1.1
-    # via -r requirements/quality.txt
+lxml-html-clean==0.2.0
+    # via
+    #   -r requirements/quality.txt
+    #   lxml
 mako==1.3.5
     # via
     #   -r requirements/quality.txt
@@ -202,7 +204,7 @@ packaging==24.1
     #   pyproject-api
     #   pytest
     #   tox
-path==16.14.0
+path==17.0.0
     # via
     #   -r requirements/quality.txt
     #   edx-i18n-tools
@@ -235,7 +237,7 @@ pygments==2.18.0
     # via
     #   -r requirements/quality.txt
     #   rich
-pylint==3.2.3
+pylint==3.2.6
     # via
     #   -r requirements/quality.txt
     #   edx-lint
@@ -259,7 +261,7 @@ pypng==0.20220715.0
     # via
     #   -r requirements/quality.txt
     #   xblock-sdk
-pyproject-api==1.6.1
+pyproject-api==1.7.1
     # via
     #   -r requirements/ci.txt
     #   tox
@@ -268,7 +270,7 @@ pyproject-hooks==1.1.0
     #   -r requirements/pip-tools.txt
     #   build
     #   pip-tools
-pytest==8.2.2
+pytest==8.3.2
     # via
     #   -r requirements/quality.txt
     #   pytest-cov
@@ -308,7 +310,7 @@ rich==13.7.1
     # via
     #   -r requirements/quality.txt
     #   cookiecutter
-s3transfer==0.10.1
+s3transfer==0.10.2
     # via
     #   -r requirements/quality.txt
     #   boto3
@@ -324,7 +326,7 @@ six==1.16.0
     #   fs
     #   fs-s3fs
     #   python-dateutil
-sqlparse==0.5.0
+sqlparse==0.5.1
     # via
     #   -r requirements/quality.txt
     #   django
@@ -336,22 +338,25 @@ text-unidecode==1.3
     # via
     #   -r requirements/quality.txt
     #   python-slugify
-tomlkit==0.12.5
+tomlkit==0.13.0
     # via
     #   -r requirements/quality.txt
     #   pylint
 tox==4.15.1
-    # via -r requirements/ci.txt
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/ci.txt
 types-python-dateutil==2.9.0.20240316
     # via
     #   -r requirements/quality.txt
     #   arrow
-urllib3==2.2.2
+urllib3==2.2.2 ; python_version > "3.10"
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/quality.txt
     #   botocore
     #   requests
-virtualenv==20.26.2
+virtualenv==20.26.3
     # via
     #   -r requirements/ci.txt
     #   tox
@@ -369,7 +374,7 @@ wheel==0.43.0
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
-xblock[django]==4.0.1
+xblock[django]==5.0.0
     # via
     #   -r requirements/quality.txt
     #   xblock-sdk
diff --git a/requirements/pip.txt b/requirements/pip.txt
index a1e3371..54b0571 100644
--- a/requirements/pip.txt
+++ b/requirements/pip.txt
@@ -8,7 +8,7 @@ wheel==0.43.0
     # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==24.0
+pip==24.2
     # via -r requirements/pip.in
-setuptools==70.1.0
+setuptools==72.1.0
     # via -r requirements/pip.in
diff --git a/requirements/quality.txt b/requirements/quality.txt
index 8be459f..c06e32b 100644
--- a/requirements/quality.txt
+++ b/requirements/quality.txt
@@ -16,7 +16,7 @@ asgiref==3.8.1
     # via
     #   -r requirements/test.txt
     #   django
-astroid==3.2.2
+astroid==3.2.4
     # via
     #   pylint
     #   pylint-celery
@@ -24,16 +24,16 @@ binaryornot==0.4.4
     # via
     #   -r requirements/test.txt
     #   cookiecutter
-boto3==1.34.130
+boto3==1.34.150
     # via
     #   -r requirements/test.txt
     #   fs-s3fs
-botocore==1.34.130
+botocore==1.34.150
     # via
     #   -r requirements/test.txt
     #   boto3
     #   s3transfer
-certifi==2024.6.2
+certifi==2024.7.4
     # via
     #   -r requirements/test.txt
     #   requests
@@ -60,7 +60,7 @@ cookiecutter==2.6.0
     # via
     #   -r requirements/test.txt
     #   xblock-sdk
-coverage[toml]==7.5.3
+coverage[toml]==7.6.0
     # via
     #   -r requirements/test.txt
     #   pytest-cov
@@ -68,7 +68,7 @@ ddt==1.7.2
     # via -r requirements/test.txt
 dill==0.3.8
     # via pylint
-django==4.2.13
+django==4.2.14
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/test.txt
@@ -83,9 +83,9 @@ django-appconf==1.0.6
     #   django-statici18n
 django-statici18n==2.5.0
     # via -r requirements/test.txt
-edx-i18n-tools==1.6.0
+edx-i18n-tools==1.6.1
     # via -r requirements/test.txt
-edx-lint==5.3.6
+edx-lint==5.3.7
     # via -r requirements/quality.in
 fs==2.4.16
     # via
@@ -129,8 +129,10 @@ lxml[html-clean]==5.2.2
     #   lxml-html-clean
     #   xblock
     #   xblock-sdk
-lxml-html-clean==0.1.1
-    # via -r requirements/test.txt
+lxml-html-clean==0.2.0
+    # via
+    #   -r requirements/test.txt
+    #   lxml
 mako==1.3.5
     # via
     #   -r requirements/test.txt
@@ -161,7 +163,7 @@ packaging==24.1
     # via
     #   -r requirements/test.txt
     #   pytest
-path==16.14.0
+path==17.0.0
     # via
     #   -r requirements/test.txt
     #   edx-i18n-tools
@@ -183,7 +185,7 @@ pygments==2.18.0
     # via
     #   -r requirements/test.txt
     #   rich
-pylint==3.2.3
+pylint==3.2.6
     # via
     #   edx-lint
     #   pylint-celery
@@ -201,7 +203,7 @@ pypng==0.20220715.0
     # via
     #   -r requirements/test.txt
     #   xblock-sdk
-pytest==8.2.2
+pytest==8.3.2
     # via
     #   -r requirements/test.txt
     #   pytest-cov
@@ -241,7 +243,7 @@ rich==13.7.1
     # via
     #   -r requirements/test.txt
     #   cookiecutter
-s3transfer==0.10.1
+s3transfer==0.10.2
     # via
     #   -r requirements/test.txt
     #   boto3
@@ -257,7 +259,7 @@ six==1.16.0
     #   fs
     #   fs-s3fs
     #   python-dateutil
-sqlparse==0.5.0
+sqlparse==0.5.1
     # via
     #   -r requirements/test.txt
     #   django
@@ -267,14 +269,15 @@ text-unidecode==1.3
     # via
     #   -r requirements/test.txt
     #   python-slugify
-tomlkit==0.12.5
+tomlkit==0.13.0
     # via pylint
 types-python-dateutil==2.9.0.20240316
     # via
     #   -r requirements/test.txt
     #   arrow
-urllib3==2.2.2
+urllib3==2.2.2 ; python_version > "3.10"
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/test.txt
     #   botocore
     #   requests
@@ -288,7 +291,7 @@ webob==1.8.7
     #   -r requirements/test.txt
     #   xblock
     #   xblock-sdk
-xblock[django]==4.0.1
+xblock[django]==5.0.0
     # via
     #   -r requirements/test.txt
     #   xblock-sdk
diff --git a/requirements/test.txt b/requirements/test.txt
index 93b1c99..cd65f48 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -16,16 +16,16 @@ asgiref==3.8.1
     #   django
 binaryornot==0.4.4
     # via cookiecutter
-boto3==1.34.130
+boto3==1.34.150
     # via
     #   -r requirements/base.txt
     #   fs-s3fs
-botocore==1.34.130
+botocore==1.34.150
     # via
     #   -r requirements/base.txt
     #   boto3
     #   s3transfer
-certifi==2024.6.2
+certifi==2024.7.4
     # via requests
 chardet==5.2.0
     # via binaryornot
@@ -35,7 +35,7 @@ click==8.1.7
     # via cookiecutter
 cookiecutter==2.6.0
     # via xblock-sdk
-coverage[toml]==7.5.3
+coverage[toml]==7.6.0
     # via pytest-cov
 ddt==1.7.2
     # via -r requirements/test.in
@@ -53,7 +53,7 @@ django-appconf==1.0.6
     #   django-statici18n
 django-statici18n==2.5.0
     # via -r requirements/base.txt
-edx-i18n-tools==1.6.0
+edx-i18n-tools==1.6.1
     # via -r requirements/test.in
 fs==2.4.16
     # via
@@ -88,7 +88,7 @@ lxml[html-clean]==5.2.2
     #   lxml-html-clean
     #   xblock
     #   xblock-sdk
-lxml-html-clean==0.1.1
+lxml-html-clean==0.2.0
     # via lxml
 mako==1.3.5
     # via
@@ -113,7 +113,7 @@ openedx-django-pyfs==3.6.0
     #   xblock
 packaging==24.1
     # via pytest
-path==16.14.0
+path==17.0.0
     # via edx-i18n-tools
 pluggy==1.5.0
     # via pytest
@@ -123,7 +123,7 @@ pygments==2.18.0
     # via rich
 pypng==0.20220715.0
     # via xblock-sdk
-pytest==8.2.2
+pytest==8.3.2
     # via
     #   pytest-cov
     #   pytest-django
@@ -155,7 +155,7 @@ requests==2.32.3
     #   xblock-sdk
 rich==13.7.1
     # via cookiecutter
-s3transfer==0.10.1
+s3transfer==0.10.2
     # via
     #   -r requirements/base.txt
     #   boto3
@@ -170,7 +170,7 @@ six==1.16.0
     #   fs
     #   fs-s3fs
     #   python-dateutil
-sqlparse==0.5.0
+sqlparse==0.5.1
     # via
     #   -r requirements/base.txt
     #   django
@@ -178,8 +178,9 @@ text-unidecode==1.3
     # via python-slugify
 types-python-dateutil==2.9.0.20240316
     # via arrow
-urllib3==2.2.2
+urllib3==2.2.2 ; python_version > "3.10"
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/base.txt
     #   botocore
     #   requests
@@ -193,7 +194,7 @@ webob==1.8.7
     #   -r requirements/base.txt
     #   xblock
     #   xblock-sdk
-xblock[django]==4.0.1
+xblock[django]==5.0.0
     # via
     #   -r requirements/base.txt
     #   xblock-sdk