Merge 1bcac52b17 into e1b0b3de64

.pre-commit-config.yaml

@@ -40,17 +40,17 @@ repos:
     hooks:
       - id: djhtml
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.7
+    rev: v0.1.6
     hooks:
       - id: ruff
         args: [--fix]
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v4.0.0-alpha.4
+    rev: v3.1.0
     hooks:
       - id: prettier
         types_or: [javascript, css]
   - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v8.55.0
+    rev: v8.54.0
     hooks:
       - id: eslint
         args: [--fix]
@@ -59,7 +59,7 @@ repos:
           - eslint@8.36.0
           - eslint-config-prettier@8.5.0
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: 1.5.3
+    rev: 1.5.1
     hooks:
       - id: pyproject-fmt
   - repo: https://github.com/jazzband/pip-tools

requirements-dev.txt

@@ -4,20 +4,15 @@
 #
 #    pip-compile --allow-unsafe requirements-dev.in
 #
-aiohttp==3.9.1
-    # via black
-aiosignal==1.3.1
-    # via aiohttp
 asgiref==3.7.2
     # via
     #   -c constraints.txt
     #   django
 attrs==23.1.0
     # via
-    #   aiohttp
     #   outcome
     #   trio
-black==23.12.0
+black==23.11.0
     # via -r requirements-dev.in
 build==1.0.3
     # via pip-tools
@@ -36,11 +31,11 @@ click==8.1.7
     # via
     #   black
     #   pip-tools
-coverage[toml]==7.3.3
+coverage[toml]==7.3.2
     # via
     #   coverage
     #   pytest-cov
-distlib==0.3.8
+distlib==0.3.7
     # via virtualenv
 django==4.2.8
     # via
@@ -48,14 +43,10 @@ django==4.2.8
     #   model-bakery
 factory-boy==3.3.0
     # via -r requirements-dev.in
-faker==21.0.0
+faker==20.1.0
     # via factory-boy
 filelock==3.13.1
     # via virtualenv
-frozenlist==1.4.1
-    # via
-    #   aiohttp
-    #   aiosignal
 h11==0.14.0
     # via wsproto
 identify==2.5.33
@@ -65,7 +56,6 @@ idna==3.6
     #   -c constraints.txt
     #   requests
     #   trio
-    #   yarl
 iniconfig==2.0.0
     # via pytest
 invoke==2.2.0
@@ -76,10 +66,6 @@ markupsafe==2.1.3
     # via jinja2
 model-bakery==1.17.0
     # via -r requirements-dev.in
-multidict==6.0.4
-    # via
-    #   aiohttp
-    #   yarl
 mypy-extensions==1.0.0
     # via black
 nodeenv==1.8.0
@@ -145,7 +131,7 @@ requests==2.31.0
     #   -c constraints.txt
     #   pytest-base-url
     #   pytest-selenium
-ruff==0.1.8
+ruff==0.1.7
     # via -r requirements-dev.in
 selenium==4.9.1
     # via
@@ -165,7 +151,7 @@ sqlparse==0.4.4
     #   django
 tenacity==8.2.3
     # via pytest-selenium
-trio==0.23.2
+trio==0.23.1
     # via
     #   selenium
     #   trio-websocket
@@ -183,11 +169,9 @@ wheel==0.42.0
     # via pip-tools
 wsproto==1.2.0
     # via trio-websocket
-yarl==1.9.4
-    # via aiohttp
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==23.3.2
+pip==23.3.1
     # via pip-tools
 setuptools==69.0.2
     # via

src/purchase/migrations/0006_basketitem_unit_price_cents.py

@@ -4,7 +4,7 @@ from django.db import migrations, models
 
 
 def forwards(apps, schema_editor):
-    BasketItem = apps.get_model("purchase", "BasketItem")
+    BasketItem = apps.get_model("purchase", "BasketItem")  # noqa: N806
     items = (
         BasketItem.objects.using(schema_editor.connection.alias)
         .all()

src/purchase/migrations/0014_alter_basket_payment_method.py

@@ -5,7 +5,7 @@ from django.db import migrations, models
 
 
 def delete_baskets_without_payment_method(apps, schema_editor):
-    Basket = apps.get_model("purchase", "Basket")
+    Basket = apps.get_model("purchase", "Basket")  # noqa: N806
     Basket.objects.using(schema_editor.connection.alias).filter(
         payment_method=None,
     ).delete()

src/purchase/migrations/0017_productcategory.py

@@ -5,7 +5,7 @@ from django.db import migrations, models
 
 
 def create_default_categories(apps, schema_editor):
-    ProductCategory = apps.get_model("purchase", "ProductCategory")
+    ProductCategory = apps.get_model("purchase", "ProductCategory")  # noqa: N806
     ProductCategory.objects.using(schema_editor.connection.alias).create(
         name="default",
         color_hue=0,