[pre-commit.ci] pre-commit autoupdate

.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -35,7 +35,7 @@ repos:
             sh,
           ]
   - repo: https://github.com/scop/pre-commit-shfmt
-    rev: v3.10.0-1
+    rev: v3.10.0-2
     hooks:
       - id: shfmt
   - repo: https://github.com/adrienverge/yamllint.git
@@ -67,7 +67,7 @@ repos:
           - --exclude-files
           - ".*/generated/"
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.4.10"
+    rev: "v0.9.4"
     hooks:
       - id: ruff-format
       - id: ruff

conftest.py

@@ -33,7 +33,7 @@ def mock_requests_get():
 
 
 @pytest.fixture(autouse=True)
-def prevent_requests(mocker, request):  # noqa: PT004
+def prevent_requests(mocker, request):
     """Patch requests to error on request by default"""
     if "mocked_responses" in request.fixturenames:
         return

fixtures/common.py

@@ -14,13 +14,13 @@
 
 
 @pytest.fixture(autouse=True)
-def silence_factory_logging():  # noqa: PT004
+def silence_factory_logging():
     """Only show factory errors"""
     logging.getLogger("factory").setLevel(logging.ERROR)
 
 
 @pytest.fixture(autouse=True)
-def warnings_as_errors():  # noqa: PT004
+def warnings_as_errors():
     """
     Convert warnings to errors. This should only affect unit tests, letting pylint and other plugins
     raise DeprecationWarnings without erroring.
@@ -49,13 +49,13 @@ def warnings_as_errors():  # noqa: PT004
         warnings.resetwarnings()
 
 
-@pytest.fixture()
-def randomness():  # noqa: PT004
+@pytest.fixture
+def randomness():
     """Ensure a fixed seed for factoryboy"""
     factory.fuzzy.reseed_random("happy little clouds")
 
 
-@pytest.fixture()
+@pytest.fixture
 def mocked_celery(mocker):
     """Mock object that patches certain celery functions"""
     exception_class = TabError
@@ -73,20 +73,20 @@ def mocked_celery(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_context(mocker, user):
     """Mock context for serializers"""
     return {"request": mocker.Mock(user=user)}
 
 
-@pytest.fixture()
+@pytest.fixture
 def mocked_responses():
     """Mock responses fixture"""
     with responses.RequestsMock() as rsps:
         yield rsps
 
 
-@pytest.fixture()
+@pytest.fixture
 def admin_drf_client(admin_user):
     """DRF API test client with admin user"""
     client = APIClient()

fixtures/users.py

@@ -11,34 +11,34 @@
 from unified_ecommerce.factories import UserFactory
 
 
-@pytest.fixture()
+@pytest.fixture
 def user(db):  # noqa: ARG001
     """Create a user"""
     return UserFactory.create()
 
 
-@pytest.fixture()
+@pytest.fixture
 def staff_user(db):  # noqa: ARG001
     """Create a staff user"""
     return UserFactory.create(is_staff=True)
 
 
-@pytest.fixture()
+@pytest.fixture
 def logged_in_user(client, user):
     """Log the user in and yield the user object"""
     client.force_login(user)
     return user
 
 
-@pytest.fixture()
+@pytest.fixture
 def logged_in_profile(client):
     """Add a Profile and logged-in User"""
     user = UserFactory.create(username="george")
     client.force_login(user)
     return user.profile
 
 
-@pytest.fixture()
+@pytest.fixture
 def jwt_token(db, user, client, rf, settings):  # noqa: ARG001
     """Creates a JWT token for a regular user"""  # noqa: D401
     jwt_payload_handler = api_settings.JWT_PAYLOAD_HANDLER
@@ -50,31 +50,31 @@ def jwt_token(db, user, client, rf, settings):  # noqa: ARG001
     return token
 
 
-@pytest.fixture()
+@pytest.fixture
 def client(db):  # noqa: ARG001
     """
     Similar to the builtin client but this provides the DRF client instead of the Django test client.
     """  # noqa: E501
     return APIClient()
 
 
-@pytest.fixture()
+@pytest.fixture
 def user_client(user):
     """Version of the client that is authenticated with the user"""
     client = APIClient()
     client.force_authenticate(user=user)
     return client
 
 
-@pytest.fixture()
+@pytest.fixture
 def staff_client(staff_user):
     """Version of the client that is authenticated with the staff_user"""
     client = APIClient()
     client.force_authenticate(user=staff_user)
     return client
 
 
-@pytest.fixture()
+@pytest.fixture
 def profile_image():
     """Create a PNG image"""
     image_file = BytesIO()

payments/api_test.py

@@ -64,13 +64,13 @@
 pytestmark = [pytest.mark.django_db]
 
 
-@pytest.fixture()
+@pytest.fixture
 def fulfilled_order():
     """Fixture for creating a fulfilled order"""
     return OrderFactory.create(state=Order.STATE.FULFILLED)
 
 
-@pytest.fixture()
+@pytest.fixture
 def fulfilled_transaction(fulfilled_order):
     """Fixture to creating a fulfilled transaction"""
     payment_amount = 10.00
@@ -88,7 +88,7 @@ def fulfilled_transaction(fulfilled_order):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def fulfilled_paypal_transaction(fulfilled_order):
     """Fixture to creating a fulfilled transaction"""
     payment_amount = 10.00
@@ -114,7 +114,7 @@ def fulfilled_paypal_transaction(fulfilled_order):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def fulfilled_complete_order():
     """Create a fulfilled order with line items."""
 
@@ -133,14 +133,14 @@ def fulfilled_complete_order():
     return order
 
 
-@pytest.fixture()
+@pytest.fixture
 def products():
     """Create products"""
     with reversion.create_revision():
         return ProductFactory.create_batch(5)
 
 
-@pytest.fixture()
+@pytest.fixture
 def user(db):
     """Create a user"""
     return UserFactory.create()

payments/hooks/basket_add_test.py

@@ -21,13 +21,13 @@
 FAKE = faker.Faker()
 
 
-@pytest.fixture()
+@pytest.fixture
 def basket():
     """Create a basket."""
     return BasketFactory.create()
 
 
-@pytest.fixture()
+@pytest.fixture
 def maxmimd_resolvable_ip():
     """Create an IP, and then make sure there are mappings for it."""
 
@@ -43,7 +43,7 @@ def maxmimd_resolvable_ip():
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def user_client_and_basket():
     """Create a basket, and a user client with the basket's user."""
 
@@ -79,7 +79,7 @@ def mock_basket_add_hook_steps(mocker, exceptfor: str | None = None):
     }
 
 
-@pytest.fixture()
+@pytest.fixture
 def basket_add_hook_steps(mocker):
     """Mock the steps in the basket_add hook."""
 

payments/hooks/post_sale_test.py

@@ -11,7 +11,7 @@
 pytestmark = [pytest.mark.django_db]
 
 
-@pytest.fixture()
+@pytest.fixture
 def pending_complete_order():
     """Create a pending order with line items."""
 

payments/tasks.py

@@ -53,10 +53,7 @@ def dispatch_webhook(system_webhook_url, webhook_data, attempt_count=0):
 
         if attempt_count == settings.MITOL_UE_WEBHOOK_RETRY_MAX:
             log.exception(
-                (
-                    "Hit the retry max (%s) for webhook URL %s for event %s, "
-                    "giving up"
-                ),
+                ("Hit the retry max (%s) for webhook URL %s for event %s, giving up"),
                 attempt_count,
                 webhook_dataclass,
                 exc_info=e,

payments/views/v0/__init__.py

@@ -199,8 +199,7 @@ def _create_basket_from_product(
 
 @extend_schema(
     description=(
-        "Creates or updates a basket for the current user, "
-        "adding the selected product."
+        "Creates or updates a basket for the current user, adding the selected product."
     ),
     methods=["POST"],
     request=None,
@@ -251,8 +250,7 @@ def create_basket_from_product_with_discount(
 
 @extend_schema(
     description=(
-        "Creates or updates a basket for the current user, "
-        "adding the selected product."
+        "Creates or updates a basket for the current user, adding the selected product."
     ),
     methods=["POST"],
     responses=BasketWithProductSerializer,

system_meta/management/commands/generate_test_data.py

@@ -59,7 +59,7 @@ def fake_courseware_id(courseware_type: str, **kwargs) -> str:
     courseware_type = courseware_type.lower()
     optional_third_digit = random.randint(0, 9) if fake.boolean() else ""
     optional_run_tag = (
-        f"+{random.randint(1,3)}T{fake.date_this_decade().year}"
+        f"+{random.randint(1, 3)}T{fake.date_this_decade().year}"
         if kwargs.get("include_run_tag", False)
         else ""
     )

unified_ecommerce/utils_test.py

@@ -102,7 +102,7 @@ def test_markdown_to_plain_text():
     assert html_to_plain_text(normal_text) == normal_text
 
 
-@pytest.mark.django_db()
+@pytest.mark.django_db
 @pytest.mark.parametrize("chunk_size", [2, 3, 5, 7, 9, 10])
 def test_prefetched_iterator(chunk_size):
     """