Merge remote-tracking branch 'origin/main' into sshin/fix/1859

Author: suejung-sentry

api/internal/commit/serializers.py

@@ -41,7 +41,7 @@ def get_report(self, commit: Commit):
         for filename in report.files:
             file_report = report.get(filename)
             file_totals = CommitTotalsSerializer(
-                {key: val for key, val in zip(TOTALS_MAP, file_report.totals)}
+                dict(zip(TOTALS_MAP, file_report.totals))
             )
             files.append(
                 {

api/internal/owner/serializers.py

@@ -1,5 +1,4 @@
 import logging
-from dataclasses import asdict
 from datetime import datetime
 
 from dateutil.relativedelta import relativedelta
@@ -127,10 +126,9 @@ def validate_value(self, value):
         current_owner = self.context["request"].current_owner
 
         plan_service = PlanService(current_org=current_org)
-        available_plans = [
-            asdict(plan) for plan in plan_service.available_plans(current_owner)
+        plan_values = [
+            plan["value"] for plan in plan_service.available_plans(current_owner)
         ]
-        plan_values = [plan["value"] for plan in available_plans]
         if value not in plan_values:
             if value in SENTRY_PAID_USER_PLAN_REPRESENTATIONS:
                 log.warning(

api/internal/tests/views/test_account_viewset.py

@@ -960,7 +960,7 @@ def test_update_team_plan_must_fail_if_too_many_activated_users_during_trial(sel
         self.current_owner.plan = PlanName.BASIC_PLAN_NAME.value
         self.current_owner.plan_user_count = 1
         self.current_owner.trial_status = TrialStatus.ONGOING.value
-        self.current_owner.plan_activated_users = [i for i in range(11)]
+        self.current_owner.plan_activated_users = list(range(11))
         self.current_owner.save()
 
         desired_plans = [

api/internal/tests/views/test_self_hosted_user_viewset.py

@@ -1,6 +1,6 @@
 from unittest.mock import patch
 
-from django.test import TransactionTestCase, override_settings
+from django.test import TestCase, override_settings
 from rest_framework.reverse import reverse
 from shared.django_apps.core.tests.factories import OwnerFactory
 
@@ -10,15 +10,15 @@
 
 
 @override_settings(IS_ENTERPRISE=True, ROOT_URLCONF="api.internal.enterprise_urls")
-class UserViewsetUnauthenticatedTestCase(TransactionTestCase):
+class UserViewsetUnauthenticatedTestCase(TestCase):
     def test_list_users(self):
         res = self.client.get(reverse("selfhosted-users-list"))
         # not authenticated
         assert res.status_code == 401
 
 
 @override_settings(IS_ENTERPRISE=True, ROOT_URLCONF="api.internal.enterprise_urls")
-class UserViewsetTestCase(TransactionTestCase):
+class UserViewsetTestCase(TestCase):
     def setUp(self):
         self.owner = OwnerFactory()
         self.current_owner = OwnerFactory(organizations=[self.owner.ownerid])

api/internal/tests/views/test_user_viewset.py

@@ -3,7 +3,7 @@
 
 from rest_framework import status
 from rest_framework.reverse import reverse
-from rest_framework.test import APITransactionTestCase
+from rest_framework.test import APITestCase
 from shared.django_apps.core.tests.factories import (
     OwnerFactory,
     PullFactory,
@@ -14,7 +14,7 @@
 from utils.test_utils import APIClient
 
 
-class UserViewSetTests(APITransactionTestCase):
+class UserViewSetTests(APITestCase):
     def setUp(self):
         non_org_active_user = OwnerFactory()
         self.current_owner = OwnerFactory(

billing/views.py

@@ -20,7 +20,7 @@
 
 if settings.STRIPE_API_KEY:
     stripe.api_key = settings.STRIPE_API_KEY
-    stripe.api_version = "2024-04-10"
+    stripe.api_version = "2024-12-18.acacia"
 
 log = logging.getLogger(__name__)
 

codecov/tests/base_test.py

@@ -1,10 +1,10 @@
 import json
 
 from django.conf import settings
-from django.test import TransactionTestCase
+from django.test import TestCase
 
 
-class InternalAPITest(TransactionTestCase):
+class InternalAPITest(TestCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()

codecov_auth/tests/test_admin.py

@@ -480,8 +480,8 @@ def test_stale_user_cleanup():
 
     # remove stale users with default > 90 days
     removed_users, affected_orgs = find_and_remove_stale_users(orgs)
-    assert removed_users == set([users[0].ownerid, users[2].ownerid, users[4].ownerid])
-    assert affected_orgs == set([orgs[0].ownerid, orgs[1].ownerid])
+    assert removed_users == {users[0].ownerid, users[2].ownerid, users[4].ownerid}
+    assert affected_orgs == {orgs[0].ownerid, orgs[1].ownerid}
 
     orgs = list(
         Owner.objects.filter(ownerid__in=[org.ownerid for org in orgs])
@@ -493,8 +493,8 @@ def test_stale_user_cleanup():
 
     # remove even more stale users
     removed_users, affected_orgs = find_and_remove_stale_users(orgs, timedelta(days=30))
-    assert removed_users == set([users[1].ownerid, users[3].ownerid])
-    assert affected_orgs == set([orgs[0].ownerid, orgs[1].ownerid])
+    assert removed_users == {users[1].ownerid, users[3].ownerid}
+    assert affected_orgs == {orgs[0].ownerid, orgs[1].ownerid}
 
     orgs = list(
         Owner.objects.filter(ownerid__in=[org.ownerid for org in orgs])

codecov_auth/views/base.py

@@ -302,14 +302,14 @@ def _check_enterprise_organizations_membership(self, user_dict, orgs):
         """Checks if a user belongs to the restricted organizations (or teams if GitHub) allowed in settings."""
         if settings.IS_ENTERPRISE and get_config(self.service, "organizations"):
             orgs_in_settings = set(get_config(self.service, "organizations"))
-            orgs_in_user = set(org["username"] for org in orgs)
+            orgs_in_user = {org["username"] for org in orgs}
             if not (orgs_in_settings & orgs_in_user):
                 raise PermissionDenied(
                     "You must be a member of an organization listed in the Codecov Enterprise setup."
                 )
             if get_config(self.service, "teams") and "teams" in user_dict:
                 teams_in_settings = set(get_config(self.service, "teams"))
-                teams_in_user = set([team["name"] for team in user_dict["teams"]])
+                teams_in_user = {team["name"] for team in user_dict["teams"]}
                 if not (teams_in_settings & teams_in_user):
                     raise PermissionDenied(
                         "You must be a member of an allowed team in your organization."

core/signals.py

@@ -20,7 +20,7 @@ def update_repository(
     changes: Dict[str, Any] = instance.tracker.changed()
     tracked_fields: List[str] = ["name", "upload_token", "activated", "active"]
 
-    if created or any([field in changes for field in tracked_fields]):
+    if created or any(field in changes for field in tracked_fields):
         data = {
             "type": "repo",
             "sync": "one",