chore: upgrade requirements

Author: BryanttV

requirements/base.txt

@@ -4,7 +4,11 @@
 #
 #    make upgrade
 #
+<<<<<<< HEAD
 asgiref==3.10.0
+=======
+asgiref==3.9.2
+>>>>>>> 8dd1b47 (chore: upgrade requirements)
     # via django
 django==4.2.25
     # via
@@ -14,7 +18,11 @@ dnspython==2.8.0
     # via pymongo
 edx-opaque-keys[django]==3.0.0
     # via -r requirements/base.in
+<<<<<<< HEAD
 pymongo==4.15.2
+=======
+pymongo==4.15.1
+>>>>>>> 8dd1b47 (chore: upgrade requirements)
     # via edx-opaque-keys
 sqlparse==0.5.3
     # via django

requirements/dev.txt

@@ -4,7 +4,11 @@
 #
 #    make upgrade
 #
+<<<<<<< HEAD
 asgiref==3.10.0
+=======
+asgiref==3.9.2
+>>>>>>> 8dd1b47 (chore: upgrade requirements)
     # via
     #   -r requirements/quality.txt
     #   django
@@ -70,7 +74,11 @@ coverage[toml]==7.10.7
     # via
     #   -r requirements/quality.txt
     #   pytest-cov
+<<<<<<< HEAD
 cryptography==46.0.2
+=======
+cryptography==46.0.1
+>>>>>>> 8dd1b47 (chore: upgrade requirements)
     # via
     #   -r requirements/quality.txt
     #   secretstorage
@@ -225,8 +233,6 @@ pluggy==1.6.0
     #   pytest
     #   pytest-cov
     #   tox
-pycodestyle==2.14.0
-    # via -r requirements/quality.txt
 pycparser==2.23
     # via
     #   -r requirements/quality.txt
@@ -258,7 +264,11 @@ pylint-plugin-utils==0.9.0
     #   -r requirements/quality.txt
     #   pylint-celery
     #   pylint-django
+<<<<<<< HEAD
 pymongo==4.15.2
+=======
+pymongo==4.15.1
+>>>>>>> 8dd1b47 (chore: upgrade requirements)
     # via
     #   -r requirements/quality.txt
     #   edx-opaque-keys
@@ -311,7 +321,11 @@ rich==14.1.0
     # via
     #   -r requirements/quality.txt
     #   twine
+<<<<<<< HEAD
 ruff==0.13.3
+=======
+ruff==0.13.2
+>>>>>>> 8dd1b47 (chore: upgrade requirements)
     # via -r requirements/quality.txt
 scriv==1.7.0
     # via -r requirements/dev.in

requirements/doc.txt

@@ -12,7 +12,11 @@ anyio==4.11.0
     # via
     #   starlette
     #   watchfiles
+<<<<<<< HEAD
 asgiref==3.10.0
+=======
+asgiref==3.9.2
+>>>>>>> 8dd1b47 (chore: upgrade requirements)
     # via
     #   -r requirements/test.txt
     #   django
@@ -45,7 +49,11 @@ coverage[toml]==7.10.7
     # via
     #   -r requirements/test.txt
     #   pytest-cov
+<<<<<<< HEAD
 cryptography==46.0.2
+=======
+cryptography==46.0.1
+>>>>>>> 8dd1b47 (chore: upgrade requirements)
     # via secretstorage
 ddt==1.7.2
     # via -r requirements/test.txt
@@ -160,7 +168,11 @@ pygments==2.19.2
     #   readme-renderer
     #   rich
     #   sphinx
+<<<<<<< HEAD
 pymongo==4.15.2
+=======
+pymongo==4.15.1
+>>>>>>> 8dd1b47 (chore: upgrade requirements)
     # via
     #   -r requirements/test.txt
     #   edx-opaque-keys

requirements/quality.txt

@@ -134,8 +134,6 @@ pluggy==1.6.0
     #   -r requirements/test.txt
     #   pytest
     #   pytest-cov
-pycodestyle==2.14.0
-    # via -r requirements/quality.in
 pycparser==2.23
     # via cffi
 pygments==2.19.2

requirements/test.txt

@@ -4,7 +4,11 @@
 #
 #    make upgrade
 #
+<<<<<<< HEAD
 asgiref==3.10.0
+=======
+asgiref==3.9.2
+>>>>>>> 8dd1b47 (chore: upgrade requirements)
     # via
     #   -r requirements/base.txt
     #   django
@@ -51,7 +55,11 @@ pluggy==1.6.0
     #   pytest-cov
 pygments==2.19.2
     # via pytest
+<<<<<<< HEAD
 pymongo==4.15.2
+=======
+pymongo==4.15.1
+>>>>>>> 8dd1b47 (chore: upgrade requirements)
     # via
     #   -r requirements/base.txt
     #   edx-opaque-keys