Merge pull request #21503 from netbox-community/21500-enable-linting-for-all-ordering-ruf022

Closes #21500: Enable RUF022 to enforce sorted `__all__` lists
2026-04-06 00:32:08 +02:00 · 2026-02-20 11:52:00 -05:00
parent bb1a44d35b 3beef34355
commit 32e2a17c88
89 changed files with 147 additions and 146 deletions
--- a/netbox/circuits/api/serializers_/circuits.py
+++ b/netbox/circuits/api/serializers_/circuits.py
@@ -29,9 +29,9 @@ from tenancy.api.serializers_.tenants import TenantSerializer
 from .providers import ProviderAccountSerializer, ProviderNetworkSerializer, ProviderSerializer

 __all__ = (
-    'CircuitSerializer',
    'CircuitGroupAssignmentSerializer',
    'CircuitGroupSerializer',
+    'CircuitSerializer',
    'CircuitTerminationSerializer',
    'CircuitTypeSerializer',
    'VirtualCircuitSerializer',
--- a/netbox/circuits/filtersets.py
+++ b/netbox/circuits/filtersets.py
@@ -25,9 +25,9 @@ __all__ = (
    'CircuitGroupFilterSet',
    'CircuitTerminationFilterSet',
    'CircuitTypeFilterSet',
-    'ProviderNetworkFilterSet',
    'ProviderAccountFilterSet',
    'ProviderFilterSet',
+    'ProviderNetworkFilterSet',
    'VirtualCircuitFilterSet',
    'VirtualCircuitTerminationFilterSet',
    'VirtualCircuitTypeFilterSet',
--- a/netbox/circuits/forms/bulk_edit.py
+++ b/netbox/circuits/forms/bulk_edit.py
@@ -33,8 +33,8 @@ __all__ = (
    'CircuitGroupBulkEditForm',
    'CircuitTerminationBulkEditForm',
    'CircuitTypeBulkEditForm',
-    'ProviderBulkEditForm',
    'ProviderAccountBulkEditForm',
+    'ProviderBulkEditForm',
    'ProviderNetworkBulkEditForm',
    'VirtualCircuitBulkEditForm',
    'VirtualCircuitTerminationBulkEditForm',
--- a/netbox/circuits/forms/bulk_import.py
+++ b/netbox/circuits/forms/bulk_import.py
@@ -12,14 +12,14 @@ from tenancy.models import Tenant
 from utilities.forms.fields import CSVChoiceField, CSVContentTypeField, CSVModelChoiceField, SlugField

 __all__ = (
-    'CircuitImportForm',
    'CircuitGroupAssignmentImportForm',
    'CircuitGroupImportForm',
+    'CircuitImportForm',
    'CircuitTerminationImportForm',
    'CircuitTerminationImportRelatedForm',
    'CircuitTypeImportForm',
-    'ProviderImportForm',
    'ProviderAccountImportForm',
+    'ProviderImportForm',
    'ProviderNetworkImportForm',
    'VirtualCircuitImportForm',
    'VirtualCircuitTerminationImportForm',
--- a/netbox/circuits/forms/filtersets.py
+++ b/netbox/circuits/forms/filtersets.py
@@ -25,8 +25,8 @@ __all__ = (
    'CircuitGroupFilterForm',
    'CircuitTerminationFilterForm',
    'CircuitTypeFilterForm',
-    'ProviderFilterForm',
    'ProviderAccountFilterForm',
+    'ProviderFilterForm',
    'ProviderNetworkFilterForm',
    'VirtualCircuitFilterForm',
    'VirtualCircuitTerminationFilterForm',
--- a/netbox/circuits/forms/model_forms.py
+++ b/netbox/circuits/forms/model_forms.py
@@ -32,8 +32,8 @@ __all__ = (
    'CircuitGroupForm',
    'CircuitTerminationForm',
    'CircuitTypeForm',
-    'ProviderForm',
    'ProviderAccountForm',
+    'ProviderForm',
    'ProviderNetworkForm',
    'VirtualCircuitForm',
    'VirtualCircuitTerminationForm',
--- a/netbox/circuits/graphql/enums.py
+++ b/netbox/circuits/graphql/enums.py
@@ -3,9 +3,9 @@ import strawberry
 from circuits.choices import *

 __all__ = (
+    'CircuitPriorityEnum',
    'CircuitStatusEnum',
    'CircuitTerminationSideEnum',
-    'CircuitPriorityEnum',
    'VirtualCircuitTerminationRoleEnum',
 )

--- a/netbox/circuits/graphql/filters.py
+++ b/netbox/circuits/graphql/filters.py
@@ -28,8 +28,8 @@ __all__ = (
    'CircuitGroupFilter',
    'CircuitTerminationFilter',
    'CircuitTypeFilter',
-    'ProviderFilter',
    'ProviderAccountFilter',
+    'ProviderFilter',
    'ProviderNetworkFilter',
    'VirtualCircuitFilter',
    'VirtualCircuitTerminationFilter',
--- a/netbox/circuits/graphql/types.py
+++ b/netbox/circuits/graphql/types.py
@@ -21,9 +21,9 @@ __all__ = (
    'CircuitTerminationType',
    'CircuitType',
    'CircuitTypeType',
-    'ProviderType',
    'ProviderAccountType',
    'ProviderNetworkType',
+    'ProviderType',
    'VirtualCircuitTerminationType',
    'VirtualCircuitType',
    'VirtualCircuitTypeType',
--- a/netbox/circuits/models/providers.py
+++ b/netbox/circuits/models/providers.py
@@ -6,9 +6,9 @@ from netbox.models import PrimaryModel
 from netbox.models.features import ContactsMixin

 __all__ = (
-    'ProviderNetwork',
    'Provider',
    'ProviderAccount',
+    'ProviderNetwork',
 )


--- a/netbox/circuits/tables/providers.py
+++ b/netbox/circuits/tables/providers.py
@@ -7,9 +7,9 @@ from netbox.tables import PrimaryModelTable, columns
 from tenancy.tables import ContactsColumnMixin

 __all__ = (
-    'ProviderTable',
    'ProviderAccountTable',
    'ProviderNetworkTable',
+    'ProviderTable',
 )


--- a/netbox/core/api/serializers_/tasks.py
+++ b/netbox/core/api/serializers_/tasks.py
@@ -2,8 +2,8 @@ from rest_framework import serializers
 from rest_framework.reverse import reverse

 __all__ = (
-    'BackgroundTaskSerializer',
    'BackgroundQueueSerializer',
+    'BackgroundTaskSerializer',
    'BackgroundWorkerSerializer',
 )

--- a/netbox/core/graphql/filters.py
+++ b/netbox/core/graphql/filters.py
@@ -17,10 +17,10 @@ if TYPE_CHECKING:
    from users.graphql.filters import UserFilter

 __all__ = (
+    'ContentTypeFilter',
    'DataFileFilter',
    'DataSourceFilter',
    'ObjectChangeFilter',
-    'ContentTypeFilter',
 )


--- a/netbox/dcim/filtersets.py
+++ b/netbox/dcim/filtersets.py
@@ -46,8 +46,8 @@ from .models import *

 __all__ = (
    'CableFilterSet',
-    'CabledObjectFilterSet',
    'CableTerminationFilterSet',
+    'CabledObjectFilterSet',
    'CommonInterfaceFilterSet',
    'ConsoleConnectionFilterSet',
    'ConsolePortFilterSet',
--- a/netbox/dcim/forms/bulk_edit.py
+++ b/netbox/dcim/forms/bulk_edit.py
@@ -48,9 +48,9 @@ __all__ = (
    'LocationBulkEditForm',
    'MACAddressBulkEditForm',
    'ManufacturerBulkEditForm',
-    'ModuleBulkEditForm',
    'ModuleBayBulkEditForm',
    'ModuleBayTemplateBulkEditForm',
+    'ModuleBulkEditForm',
    'ModuleTypeBulkEditForm',
    'ModuleTypeProfileBulkEditForm',
    'PlatformBulkEditForm',
--- a/netbox/dcim/forms/bulk_import.py
+++ b/netbox/dcim/forms/bulk_import.py
@@ -48,8 +48,8 @@ __all__ = (
    'LocationImportForm',
    'MACAddressImportForm',
    'ManufacturerImportForm',
-    'ModuleImportForm',
    'ModuleBayImportForm',
+    'ModuleImportForm',
    'ModuleTypeImportForm',
    'ModuleTypeProfileImportForm',
    'PlatformImportForm',
@@ -63,8 +63,8 @@ __all__ = (
    'RackTypeImportForm',
    'RearPortImportForm',
    'RegionImportForm',
-    'SiteImportForm',
    'SiteGroupImportForm',
+    'SiteImportForm',
    'VirtualChassisImportForm',
    'VirtualDeviceContextImportForm'
 )
--- a/netbox/dcim/forms/filtersets.py
+++ b/netbox/dcim/forms/filtersets.py
@@ -44,14 +44,14 @@ __all__ = (
    'InterfaceFilterForm',
    'InterfaceTemplateFilterForm',
    'InventoryItemFilterForm',
-    'InventoryItemTemplateFilterForm',
    'InventoryItemRoleFilterForm',
+    'InventoryItemTemplateFilterForm',
    'LocationFilterForm',
    'MACAddressFilterForm',
    'ManufacturerFilterForm',
-    'ModuleFilterForm',
    'ModuleBayFilterForm',
    'ModuleBayTemplateFilterForm',
+    'ModuleFilterForm',
    'ModuleTypeFilterForm',
    'ModuleTypeProfileFilterForm',
    'PlatformFilterForm',
@@ -62,8 +62,8 @@ __all__ = (
    'PowerPanelFilterForm',
    'PowerPortFilterForm',
    'PowerPortTemplateFilterForm',
-    'RackFilterForm',
    'RackElevationFilterForm',
+    'RackFilterForm',
    'RackReservationFilterForm',
    'RackRoleFilterForm',
    'RackTypeFilterForm',
--- a/netbox/dcim/forms/model_forms.py
+++ b/netbox/dcim/forms/model_forms.py
@@ -60,9 +60,9 @@ __all__ = (
    'LocationForm',
    'MACAddressForm',
    'ManufacturerForm',
-    'ModuleForm',
    'ModuleBayForm',
    'ModuleBayTemplateForm',
+    'ModuleForm',
    'ModuleTypeForm',
    'ModuleTypeProfileForm',
    'PlatformForm',
--- a/netbox/dcim/graphql/filters.py
+++ b/netbox/dcim/graphql/filters.py
@@ -63,9 +63,9 @@ __all__ = (
    'ConsolePortTemplateFilter',
    'ConsoleServerPortFilter',
    'ConsoleServerPortTemplateFilter',
-    'DeviceFilter',
    'DeviceBayFilter',
    'DeviceBayTemplateFilter',
+    'DeviceFilter',
    'DeviceRoleFilter',
    'DeviceTypeFilter',
    'FrontPortFilter',
@@ -78,9 +78,9 @@ __all__ = (
    'LocationFilter',
    'MACAddressFilter',
    'ManufacturerFilter',
-    'ModuleFilter',
    'ModuleBayFilter',
    'ModuleBayTemplateFilter',
+    'ModuleFilter',
    'ModuleTypeFilter',
    'ModuleTypeProfileFilter',
    'PlatformFilter',
--- a/netbox/dcim/graphql/types.py
+++ b/netbox/dcim/graphql/types.py
@@ -41,47 +41,47 @@ if TYPE_CHECKING:
 __all__ = (
    'CableType',
    'ComponentType',
-    'ConsolePortType',
    'ConsolePortTemplateType',
-    'ConsoleServerPortType',
+    'ConsolePortType',
    'ConsoleServerPortTemplateType',
-    'DeviceType',
-    'DeviceBayType',
+    'ConsoleServerPortType',
    'DeviceBayTemplateType',
+    'DeviceBayType',
    'DeviceRoleType',
+    'DeviceType',
    'DeviceTypeType',
-    'FrontPortType',
    'FrontPortTemplateType',
-    'InterfaceType',
+    'FrontPortType',
    'InterfaceTemplateType',
-    'InventoryItemType',
+    'InterfaceType',
    'InventoryItemRoleType',
    'InventoryItemTemplateType',
+    'InventoryItemType',
    'LocationType',
    'MACAddressType',
    'ManufacturerType',
    'ModularComponentType',
-    'ModuleType',
-    'ModuleBayType',
    'ModuleBayTemplateType',
+    'ModuleBayType',
+    'ModuleType',
    'ModuleTypeProfileType',
    'ModuleTypeType',
    'PlatformType',
    'PowerFeedType',
-    'PowerOutletType',
    'PowerOutletTemplateType',
+    'PowerOutletType',
    'PowerPanelType',
-    'PowerPortType',
    'PowerPortTemplateType',
-    'RackType',
+    'PowerPortType',
    'RackReservationType',
    'RackRoleType',
+    'RackType',
    'RackTypeType',
-    'RearPortType',
    'RearPortTemplateType',
+    'RearPortType',
    'RegionType',
-    'SiteType',
    'SiteGroupType',
+    'SiteType',
    'VirtualChassisType',
    'VirtualDeviceContextType',
 )
--- a/netbox/dcim/tables/devices.py
+++ b/netbox/dcim/tables/devices.py
@@ -21,14 +21,14 @@ __all__ = (
    'DeviceInterfaceTable',
    'DeviceInventoryItemTable',
    'DeviceModuleBayTable',
-    'DevicePowerPortTable',
    'DevicePowerOutletTable',
+    'DevicePowerPortTable',
    'DeviceRearPortTable',
    'DeviceRoleTable',
    'DeviceTable',
    'FrontPortTable',
-    'InterfaceTable',
    'InterfaceLAGMemberTable',
+    'InterfaceTable',
    'InventoryItemRoleTable',
    'InventoryItemTable',
    'MACAddressTable',
--- a/netbox/dcim/tables/racks.py
+++ b/netbox/dcim/tables/racks.py
@@ -9,9 +9,9 @@ from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin
 from .template_code import OUTER_UNIT, WEIGHT

 __all__ = (
-    'RackTable',
    'RackReservationTable',
    'RackRoleTable',
+    'RackTable',
    'RackTypeTable',
 )

--- a/netbox/dcim/tables/sites.py
+++ b/netbox/dcim/tables/sites.py
@@ -10,8 +10,8 @@ from .template_code import LOCATION_BUTTONS
 __all__ = (
    'LocationTable',
    'RegionTable',
-    'SiteTable',
    'SiteGroupTable',
+    'SiteTable',
 )


--- a/netbox/extras/api/serializers_/notifications.py
+++ b/netbox/extras/api/serializers_/notifications.py
@@ -7,8 +7,8 @@ from users.api.serializers_.users import GroupSerializer, UserSerializer
 from users.models import Group, User

 __all__ = (
-    'NotificationSerializer',
    'NotificationGroupSerializer',
+    'NotificationSerializer',
    'SubscriptionSerializer',
 )

--- a/netbox/extras/graphql/filter_mixins.py
+++ b/netbox/extras/graphql/filter_mixins.py
@@ -10,10 +10,10 @@ if TYPE_CHECKING:
    from .filters import *

 __all__ = (
+    'ConfigContextFilterMixin',
    'CustomFieldsFilterMixin',
    'JournalEntriesFilterMixin',
    'TagsFilterMixin',
-    'ConfigContextFilterMixin',
 )


--- a/netbox/extras/graphql/filters.py
+++ b/netbox/extras/graphql/filters.py
@@ -33,8 +33,8 @@ __all__ = (
    'ConfigContextFilter',
    'ConfigContextProfileFilter',
    'ConfigTemplateFilter',
-    'CustomFieldFilter',
    'CustomFieldChoiceSetFilter',
+    'CustomFieldFilter',
    'CustomLinkFilter',
    'EventRuleFilter',
    'ExportTemplateFilter',
--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -24,14 +24,14 @@ __all__ = (
    'BaseScript',
    'BooleanVar',
    'ChoiceVar',
-    'DateVar',
    'DateTimeVar',
-    'FileVar',
-    'IntegerVar',
+    'DateVar',
    'DecimalVar',
+    'FileVar',
    'IPAddressVar',
    'IPAddressWithMaskVar',
    'IPNetworkVar',
+    'IntegerVar',
    'MultiChoiceVar',
    'MultiObjectVar',
    'ObjectVar',
--- a/netbox/extras/tables/tables.py
+++ b/netbox/extras/tables/tables.py
@@ -28,14 +28,14 @@ __all__ = (
    'JournalEntryTable',
    'NotificationGroupTable',
    'NotificationTable',
-    'SavedFilterTable',
    'ReportResultsTable',
-    'ScriptResultsTable',
+    'SavedFilterTable',
    'ScriptJobTable',
+    'ScriptResultsTable',
    'SubscriptionTable',
    'TableConfigTable',
-    'TaggedItemTable',
    'TagTable',
+    'TaggedItemTable',
    'WebhookTable',
 )

--- a/netbox/ipam/api/serializers_/ip.py
+++ b/netbox/ipam/api/serializers_/ip.py
@@ -19,8 +19,8 @@ from .vrfs import VRFSerializer

 __all__ = (
    'AggregateSerializer',
-    'AvailableIPSerializer',
    'AvailableIPRequestSerializer',
+    'AvailableIPSerializer',
    'AvailablePrefixSerializer',
    'IPAddressSerializer',
    'IPRangeSerializer',
--- a/netbox/ipam/filtersets.py
+++ b/netbox/ipam/filtersets.py
@@ -33,9 +33,9 @@ from .choices import *
 from .models import *

 __all__ = (
-    'AggregateFilterSet',
    'ASNFilterSet',
    'ASNRangeFilterSet',
+    'AggregateFilterSet',
    'FHRPGroupAssignmentFilterSet',
    'FHRPGroupFilterSet',
    'IPAddressFilterSet',
--- a/netbox/ipam/forms/bulk_edit.py
+++ b/netbox/ipam/forms/bulk_edit.py
@@ -24,9 +24,9 @@ from utilities.forms.widgets import BulkEditNullBooleanSelect, HTMXSelect
 from utilities.templatetags.builtins.filters import bettertitle

 __all__ = (
-    'AggregateBulkEditForm',
    'ASNBulkEditForm',
    'ASNRangeBulkEditForm',
+    'AggregateBulkEditForm',
    'FHRPGroupBulkEditForm',
    'IPAddressBulkEditForm',
    'IPRangeBulkEditForm',
--- a/netbox/ipam/forms/bulk_import.py
+++ b/netbox/ipam/forms/bulk_import.py
@@ -20,9 +20,9 @@ from utilities.forms.fields import (
 from virtualization.models import VirtualMachine, VMInterface

 __all__ = (
-    'AggregateImportForm',
    'ASNImportForm',
    'ASNRangeImportForm',
+    'AggregateImportForm',
    'FHRPGroupImportForm',
    'IPAddressImportForm',
    'IPRangeImportForm',
@@ -32,8 +32,8 @@ __all__ = (
    'RouteTargetImportForm',
    'ServiceImportForm',
    'ServiceTemplateImportForm',
-    'VLANImportForm',
    'VLANGroupImportForm',
+    'VLANImportForm',
    'VLANTranslationPolicyImportForm',
    'VLANTranslationRuleImportForm',
    'VRFImportForm',
--- a/netbox/ipam/forms/filtersets.py
+++ b/netbox/ipam/forms/filtersets.py
@@ -14,9 +14,9 @@ from virtualization.models import Cluster, ClusterGroup, VirtualMachine
 from vpn.models import L2VPN

 __all__ = (
-    'AggregateFilterForm',
    'ASNFilterForm',
    'ASNRangeFilterForm',
+    'AggregateFilterForm',
    'FHRPGroupFilterForm',
    'IPAddressFilterForm',
    'IPRangeFilterForm',
--- a/netbox/ipam/forms/model_forms.py
+++ b/netbox/ipam/forms/model_forms.py
@@ -28,11 +28,11 @@ from utilities.templatetags.builtins.filters import bettertitle
 from virtualization.models import VirtualMachine, VMInterface

 __all__ = (
-    'AggregateForm',
    'ASNForm',
    'ASNRangeForm',
-    'FHRPGroupForm',
+    'AggregateForm',
    'FHRPGroupAssignmentForm',
+    'FHRPGroupForm',
    'IPAddressAssignForm',
    'IPAddressBulkAddForm',
    'IPAddressForm',
@@ -41,8 +41,8 @@ __all__ = (
    'RIRForm',
    'RoleForm',
    'RouteTargetForm',
-    'ServiceForm',
    'ServiceCreateForm',
+    'ServiceForm',
    'ServiceTemplateForm',
    'VLANForm',
    'VLANGroupForm',
--- a/netbox/ipam/graphql/enums.py
+++ b/netbox/ipam/graphql/enums.py
@@ -11,8 +11,8 @@ __all__ = (
    'IPRangeStatusEnum',
    'PrefixStatusEnum',
    'ServiceProtocolEnum',
-    'VLANStatusEnum',
    'VLANQinQRoleEnum',
+    'VLANStatusEnum',
 )

 FHRPGroupAuthTypeEnum = strawberry.enum(FHRPGroupAuthTypeChoices.as_enum(prefix='authentication'))
--- a/netbox/ipam/graphql/filters.py
+++ b/netbox/ipam/graphql/filters.py
@@ -35,8 +35,8 @@ __all__ = (
    'ASNFilter',
    'ASNRangeFilter',
    'AggregateFilter',
-    'FHRPGroupFilter',
    'FHRPGroupAssignmentFilter',
+    'FHRPGroupFilter',
    'IPAddressFilter',
    'IPRangeFilter',
    'PrefixFilter',
--- a/netbox/ipam/graphql/types.py
+++ b/netbox/ipam/graphql/types.py
@@ -28,23 +28,23 @@ if TYPE_CHECKING:
    from wireless.graphql.types import WirelessLANType

 __all__ = (
-    'ASNType',
    'ASNRangeType',
+    'ASNType',
    'AggregateType',
-    'FHRPGroupType',
    'FHRPGroupAssignmentType',
+    'FHRPGroupType',
    'IPAddressType',
    'IPRangeType',
    'PrefixType',
    'RIRType',
    'RoleType',
    'RouteTargetType',
-    'ServiceType',
    'ServiceTemplateType',
-    'VLANType',
+    'ServiceType',
    'VLANGroupType',
    'VLANTranslationPolicyType',
    'VLANTranslationRuleType',
+    'VLANType',
    'VRFType',
 )

--- a/netbox/ipam/models/ip.py
+++ b/netbox/ipam/models/ip.py
@@ -22,11 +22,11 @@ from netbox.models import OrganizationalModel, PrimaryModel
 from netbox.models.features import ContactsMixin

 __all__ = (
+    'RIR',
    'Aggregate',
    'IPAddress',
    'IPRange',
    'Prefix',
-    'RIR',
    'Role',
 )

--- a/netbox/ipam/models/vrfs.py
+++ b/netbox/ipam/models/vrfs.py
@@ -5,8 +5,8 @@ from ipam.constants import *
 from netbox.models import PrimaryModel

 __all__ = (
-    'RouteTarget',
    'VRF',
+    'RouteTarget',
 )


--- a/netbox/ipam/tables/asn.py
+++ b/netbox/ipam/tables/asn.py
@@ -6,8 +6,8 @@ from netbox.tables import OrganizationalModelTable, PrimaryModelTable, columns
 from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin

 __all__ = (
-    'ASNTable',
    'ASNRangeTable',
+    'ASNTable',
 )


--- a/netbox/ipam/tables/fhrp.py
+++ b/netbox/ipam/tables/fhrp.py
@@ -5,8 +5,8 @@ from ipam.models import *
 from netbox.tables import NetBoxTable, PrimaryModelTable, columns

 __all__ = (
-    'FHRPGroupTable',
    'FHRPGroupAssignmentTable',
+    'FHRPGroupTable',
 )


--- a/netbox/ipam/tables/vlans.py
+++ b/netbox/ipam/tables/vlans.py
@@ -18,9 +18,9 @@ __all__ = (
    'VLANGroupTable',
    'VLANMembersTable',
    'VLANTable',
-    'VLANVirtualMachinesTable',
    'VLANTranslationPolicyTable',
    'VLANTranslationRuleTable',
+    'VLANVirtualMachinesTable',
 )

 AVAILABLE_LABEL = mark_safe('<span class="badge text-bg-success">Available</span>')
--- a/netbox/netbox/api/viewsets/init.py
+++ b/netbox/netbox/api/viewsets/init.py
@@ -19,8 +19,8 @@ from utilities.query import reapply_model_ordering
 from . import mixins

 __all__ = (
-    'NetBoxReadOnlyModelViewSet',
    'NetBoxModelViewSet',
+    'NetBoxReadOnlyModelViewSet',
 )

 HTTP_ACTIONS = {
--- a/netbox/netbox/choices.py
+++ b/netbox/netbox/choices.py
@@ -5,8 +5,8 @@ from utilities.constants import CSV_DELIMITERS

 __all__ = (
    'ButtonColorChoices',
-    'ColorChoices',
    'CSVDelimiterChoices',
+    'ColorChoices',
    'DistanceUnitChoices',
    'ImportFormatChoices',
    'ImportMethodChoices',
--- a/netbox/netbox/config/init.py
+++ b/netbox/netbox/config/init.py
@@ -9,10 +9,10 @@ from django.utils.translation import gettext_lazy as _
 from .parameters import PARAMS

 __all__ = (
-    'clear_config',
-    'ConfigItem',
-    'get_config',
    'PARAMS',
+    'ConfigItem',
+    'clear_config',
+    'get_config',
 )

 _thread_locals = threading.local()
--- a/netbox/netbox/events.py
+++ b/netbox/netbox/events.py
@@ -13,9 +13,9 @@ __all__ = (
    'EVENT_TYPE_KIND_SUCCESS',
    'EVENT_TYPE_KIND_WARNING',
    'EventType',
+    'get_event_text',
    'get_event_type',
    'get_event_type_choices',
-    'get_event_text',
 )


--- a/netbox/netbox/forms/mixins.py
+++ b/netbox/netbox/forms/mixins.py
@@ -10,8 +10,8 @@ from utilities.forms.fields import DynamicModelChoiceField, DynamicModelMultiple
 __all__ = (
    'ChangelogMessageMixin',
    'CustomFieldsMixin',
-    'OwnerMixin',
    'OwnerFilterMixin',
+    'OwnerMixin',
    'SavedFiltersMixin',
    'TagsMixin',
 )
--- a/netbox/netbox/navigation/init.py
+++ b/netbox/netbox/navigation/init.py
@@ -4,12 +4,12 @@ from dataclasses import dataclass
 from django.urls import reverse_lazy

 __all__ = (
-    'get_model_item',
-    'get_model_buttons',
    'Menu',
    'MenuGroup',
    'MenuItem',
    'MenuItemButton',
+    'get_model_buttons',
+    'get_model_item',
 )


--- a/netbox/netbox/tables/columns.py
+++ b/netbox/netbox/tables/columns.py
@@ -38,9 +38,9 @@ __all__ = (
    'DistanceColumn',
    'DurationColumn',
    'LinkedCountColumn',
-    'MarkdownColumn',
-    'ManyToManyColumn',
    'MPTTColumn',
+    'ManyToManyColumn',
+    'MarkdownColumn',
    'TagColumn',
    'TemplateColumn',
    'ToggleColumn',
--- a/netbox/netbox/ui/attrs.py
+++ b/netbox/netbox/ui/attrs.py
@@ -8,10 +8,10 @@ from utilities.data import resolve_attr_path
 __all__ = (
    'AddressAttr',
    'BooleanAttr',
-    'ColorAttr',
    'ChoiceAttr',
-    'GenericForeignKeyAttr',
+    'ColorAttr',
    'GPSCoordinatesAttr',
+    'GenericForeignKeyAttr',
    'ImageAttr',
    'NestedObjectAttr',
    'NumericAttr',
--- a/netbox/netbox/views/errors.py
+++ b/netbox/netbox/views/errors.py
@@ -13,9 +13,9 @@ from django.views.generic import View
 from netbox.plugins.utils import get_installed_plugins

 __all__ = (
+    'StaticMediaFailureView',
    'handler_404',
    'handler_500',
-    'StaticMediaFailureView',
 )


--- a/netbox/netbox/views/generic/base.py
+++ b/netbox/netbox/views/generic/base.py
@@ -5,8 +5,8 @@ from django.views.generic import View
 from utilities.views import ObjectPermissionRequiredMixin

 __all__ = (
-    'BaseObjectView',
    'BaseMultiObjectView',
+    'BaseObjectView',
 )


--- a/netbox/tenancy/forms/bulk_import.py
+++ b/netbox/tenancy/forms/bulk_import.py
@@ -14,11 +14,11 @@ from ..models import *

 __all__ = (
    'ContactAssignmentImportForm',
-    'ContactImportForm',
    'ContactGroupImportForm',
+    'ContactImportForm',
    'ContactRoleImportForm',
-    'TenantImportForm',
    'TenantGroupImportForm',
+    'TenantImportForm',
 )


--- a/netbox/tenancy/forms/forms.py
+++ b/netbox/tenancy/forms/forms.py
@@ -7,8 +7,8 @@ from ..models import *

 __all__ = (
    'ContactModelFilterForm',
-    'TenancyForm',
    'TenancyFilterForm',
+    'TenancyForm',
 )


--- a/netbox/tenancy/graphql/filters.py
+++ b/netbox/tenancy/graphql/filters.py
@@ -49,12 +49,12 @@ if TYPE_CHECKING:
    from .enums import *

 __all__ = (
+    'ContactAssignmentFilter',
+    'ContactFilter',
+    'ContactGroupFilter',
+    'ContactRoleFilter',
    'TenantFilter',
    'TenantGroupFilter',
-    'ContactFilter',
-    'ContactRoleFilter',
-    'ContactGroupFilter',
-    'ContactAssignmentFilter',
 )


--- a/netbox/tenancy/graphql/types.py
+++ b/netbox/tenancy/graphql/types.py
@@ -43,8 +43,8 @@ __all__ = (
    'ContactGroupType',
    'ContactRoleType',
    'ContactType',
-    'TenantType',
    'TenantGroupType',
+    'TenantType',
 )


--- a/netbox/tenancy/models/contacts.py
+++ b/netbox/tenancy/models/contacts.py
@@ -9,8 +9,8 @@ from netbox.models.features import CustomFieldsMixin, ExportTemplatesMixin, Tags
 from tenancy.choices import *

 __all__ = (
-    'ContactAssignment',
    'Contact',
+    'ContactAssignment',
    'ContactGroup',
    'ContactRole',
 )
--- a/netbox/tenancy/tables/columns.py
+++ b/netbox/tenancy/tables/columns.py
@@ -7,9 +7,9 @@ from .template_code import *

 __all__ = (
    'ContactsColumnMixin',
+    'TenancyColumnsMixin',
    'TenantColumn',
    'TenantGroupColumn',
-    'TenancyColumnsMixin',
 )


--- a/netbox/users/forms/bulk_edit.py
+++ b/netbox/users/forms/bulk_edit.py
@@ -15,8 +15,8 @@ __all__ = (
    'ObjectPermissionBulkEditForm',
    'OwnerBulkEditForm',
    'OwnerGroupBulkEditForm',
-    'UserBulkEditForm',
    'TokenBulkEditForm',
+    'UserBulkEditForm',
 )


--- a/netbox/users/forms/bulk_import.py
+++ b/netbox/users/forms/bulk_import.py
@@ -10,8 +10,8 @@ __all__ = (
    'GroupImportForm',
    'OwnerGroupImportForm',
    'OwnerImportForm',
-    'UserImportForm',
    'TokenImportForm',
+    'UserImportForm',
 )


--- a/netbox/utilities/forms/forms.py
+++ b/netbox/utilities/forms/forms.py
@@ -11,8 +11,8 @@ __all__ = (
    'BulkDeleteForm',
    'BulkEditForm',
    'BulkRenameForm',
-    'ConfirmationForm',
    'CSVModelForm',
+    'ConfirmationForm',
    'DeleteForm',
    'FilterForm',
    'TableConfigForm',
--- a/netbox/utilities/forms/mixins.py
+++ b/netbox/utilities/forms/mixins.py
@@ -11,11 +11,11 @@ from utilities.forms.widgets import FilterModifierWidget
 from utilities.forms.widgets.modifiers import MODIFIER_EMPTY_FALSE, MODIFIER_EMPTY_TRUE

 __all__ = (
+    'FORM_FIELD_LOOKUPS',
    'BackgroundJobMixin',
    'CheckLastUpdatedMixin',
    'DistanceValidationMixin',
    'FilterModifierMixin',
-    'FORM_FIELD_LOOKUPS',
 )


--- a/netbox/utilities/forms/utils.py
+++ b/netbox/utilities/forms/utils.py
@@ -17,9 +17,9 @@ __all__ = (
    'get_field_value',
    'get_selected_values',
    'parse_alphanumeric_range',
+    'parse_csv',
    'parse_numeric_range',
    'restrict_form_fields',
-    'parse_csv',
    'validate_csv',
 )

--- a/netbox/utilities/forms/widgets/modifiers.py
+++ b/netbox/utilities/forms/widgets/modifiers.py
@@ -5,9 +5,9 @@ from django.utils.translation import gettext_lazy as _
 from utilities.forms.widgets.apiselect import APISelect, APISelectMultiple

 __all__ = (
-    'FilterModifierWidget',
    'MODIFIER_EMPTY_FALSE',
    'MODIFIER_EMPTY_TRUE',
+    'FilterModifierWidget',
 )

 # Modifier codes for empty/null checking
--- a/netbox/utilities/htmx.py
+++ b/netbox/utilities/htmx.py
@@ -5,8 +5,8 @@ from django.urls import reverse

 __all__ = (
    'htmx_current_url',
-    'htmx_partial',
    'htmx_maybe_redirect_current_page',
+    'htmx_partial',
 )


--- a/netbox/utilities/templatetags/builtins/tags.py
+++ b/netbox/utilities/templatetags/builtins/tags.py
@@ -13,8 +13,8 @@ __all__ = (
    'checkmark',
    'copy_content',
    'customfield_value',
-    'htmx_table',
    'formaction',
+    'htmx_table',
    'static_with_params',
    'tag',
 )
--- a/netbox/virtualization/api/serializers_/nested.py
+++ b/netbox/virtualization/api/serializers_/nested.py
@@ -2,8 +2,8 @@ from netbox.api.serializers import WritableNestedSerializer
 from virtualization import models

 __all__ = (
-    'NestedVirtualMachineSerializer',
    'NestedVMInterfaceSerializer',
+    'NestedVirtualMachineSerializer',
 )


--- a/netbox/virtualization/filtersets.py
+++ b/netbox/virtualization/filtersets.py
@@ -23,9 +23,9 @@ __all__ = (
    'ClusterFilterSet',
    'ClusterGroupFilterSet',
    'ClusterTypeFilterSet',
+    'VMInterfaceFilterSet',
    'VirtualDiskFilterSet',
    'VirtualMachineFilterSet',
-    'VMInterfaceFilterSet',
 )


--- a/netbox/virtualization/forms/bulk_create.py
+++ b/netbox/virtualization/forms/bulk_create.py
@@ -6,8 +6,8 @@ from utilities.forms.fields import ExpandableNameField
 from virtualization.models import VirtualDisk, VirtualMachine, VMInterface

 __all__ = (
-    'VirtualDiskBulkCreateForm',
    'VMInterfaceBulkCreateForm',
+    'VirtualDiskBulkCreateForm',
 )


--- a/netbox/virtualization/forms/bulk_edit.py
+++ b/netbox/virtualization/forms/bulk_edit.py
@@ -21,11 +21,11 @@ __all__ = (
    'ClusterBulkEditForm',
    'ClusterGroupBulkEditForm',
    'ClusterTypeBulkEditForm',
+    'VMInterfaceBulkEditForm',
+    'VMInterfaceBulkRenameForm',
    'VirtualDiskBulkEditForm',
    'VirtualDiskBulkRenameForm',
    'VirtualMachineBulkEditForm',
-    'VMInterfaceBulkEditForm',
-    'VMInterfaceBulkRenameForm',
 )


--- a/netbox/virtualization/forms/bulk_import.py
+++ b/netbox/virtualization/forms/bulk_import.py
@@ -14,12 +14,12 @@ from virtualization.choices import *
 from virtualization.models import *

 __all__ = (
-    'ClusterImportForm',
    'ClusterGroupImportForm',
+    'ClusterImportForm',
    'ClusterTypeImportForm',
+    'VMInterfaceImportForm',
    'VirtualDiskImportForm',
    'VirtualMachineImportForm',
-    'VMInterfaceImportForm',
 )


--- a/netbox/virtualization/forms/filtersets.py
+++ b/netbox/virtualization/forms/filtersets.py
@@ -20,9 +20,9 @@ __all__ = (
    'ClusterFilterForm',
    'ClusterGroupFilterForm',
    'ClusterTypeFilterForm',
+    'VMInterfaceFilterForm',
    'VirtualDiskFilterForm',
    'VirtualMachineFilterForm',
-    'VMInterfaceFilterForm',
 )


--- a/netbox/virtualization/forms/model_forms.py
+++ b/netbox/virtualization/forms/model_forms.py
@@ -25,9 +25,9 @@ __all__ = (
    'ClusterGroupForm',
    'ClusterRemoveDevicesForm',
    'ClusterTypeForm',
+    'VMInterfaceForm',
    'VirtualDiskForm',
    'VirtualMachineForm',
-    'VMInterfaceForm',
 )


--- a/netbox/virtualization/forms/object_create.py
+++ b/netbox/virtualization/forms/object_create.py
@@ -5,8 +5,8 @@ from utilities.forms.fields import ExpandableNameField
 from .model_forms import VirtualDiskForm, VMInterfaceForm

 __all__ = (
-    'VirtualDiskCreateForm',
    'VMInterfaceCreateForm',
+    'VirtualDiskCreateForm',
 )


--- a/netbox/virtualization/graphql/filters.py
+++ b/netbox/virtualization/graphql/filters.py
@@ -31,9 +31,9 @@ __all__ = (
    'ClusterFilter',
    'ClusterGroupFilter',
    'ClusterTypeFilter',
-    'VirtualMachineFilter',
    'VMInterfaceFilter',
    'VirtualDiskFilter',
+    'VirtualMachineFilter',
 )


--- a/netbox/virtualization/graphql/types.py
+++ b/netbox/virtualization/graphql/types.py
@@ -28,12 +28,12 @@ if TYPE_CHECKING:
    from tenancy.graphql.types import TenantType

 __all__ = (
-    'ClusterType',
    'ClusterGroupType',
+    'ClusterType',
    'ClusterTypeType',
+    'VMInterfaceType',
    'VirtualDiskType',
    'VirtualMachineType',
-    'VMInterfaceType',
 )


--- a/netbox/virtualization/models/virtualmachines.py
+++ b/netbox/virtualization/models/virtualmachines.py
@@ -23,9 +23,9 @@ from utilities.tracking import TrackingModelMixin
 from virtualization.choices import *

 __all__ = (
+    'VMInterface',
    'VirtualDisk',
    'VirtualMachine',
-    'VMInterface',
 )


--- a/netbox/virtualization/tables/clusters.py
+++ b/netbox/virtualization/tables/clusters.py
@@ -6,8 +6,8 @@ from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin
 from virtualization.models import Cluster, ClusterGroup, ClusterType

 __all__ = (
-    'ClusterTable',
    'ClusterGroupTable',
+    'ClusterTable',
    'ClusterTypeTable',
 )

--- a/netbox/virtualization/tables/virtualmachines.py
+++ b/netbox/virtualization/tables/virtualmachines.py
@@ -10,11 +10,11 @@ from virtualization.models import VirtualDisk, VirtualMachine, VMInterface
 from .template_code import *

 __all__ = (
+    'VMInterfaceTable',
    'VirtualDiskTable',
    'VirtualMachineTable',
-    'VirtualMachineVirtualDiskTable',
    'VirtualMachineVMInterfaceTable',
-    'VMInterfaceTable',
+    'VirtualMachineVirtualDiskTable',
 )


--- a/netbox/vpn/api/views.py
+++ b/netbox/vpn/api/views.py
@@ -12,8 +12,8 @@ __all__ = (
    'IPSecPolicyViewSet',
    'IPSecProfileViewSet',
    'IPSecProposalViewSet',
-    'L2VPNViewSet',
    'L2VPNTerminationViewSet',
+    'L2VPNViewSet',
    'TunnelGroupViewSet',
    'TunnelTerminationViewSet',
    'TunnelViewSet',
--- a/netbox/vpn/forms/bulk_import.py
+++ b/netbox/vpn/forms/bulk_import.py
@@ -18,8 +18,8 @@ __all__ = (
    'IPSecProposalImportForm',
    'L2VPNImportForm',
    'L2VPNTerminationImportForm',
-    'TunnelImportForm',
    'TunnelGroupImportForm',
+    'TunnelImportForm',
    'TunnelTerminationImportForm',
 )

--- a/netbox/vpn/graphql/filters.py
+++ b/netbox/vpn/graphql/filters.py
@@ -23,16 +23,16 @@ if TYPE_CHECKING:
    from .enums import *

 __all__ = (
-    'TunnelGroupFilter',
-    'TunnelTerminationFilter',
-    'TunnelFilter',
-    'IKEProposalFilter',
    'IKEPolicyFilter',
-    'IPSecProposalFilter',
+    'IKEProposalFilter',
    'IPSecPolicyFilter',
    'IPSecProfileFilter',
+    'IPSecProposalFilter',
    'L2VPNFilter',
    'L2VPNTerminationFilter',
+    'TunnelFilter',
+    'TunnelGroupFilter',
+    'TunnelTerminationFilter',
 )


--- a/netbox/vpn/graphql/types.py
+++ b/netbox/vpn/graphql/types.py
@@ -22,8 +22,8 @@ __all__ = (
    'IPSecPolicyType',
    'IPSecProfileType',
    'IPSecProposalType',
-    'L2VPNType',
    'L2VPNTerminationType',
+    'L2VPNType',
    'TunnelGroupType',
    'TunnelTerminationType',
    'TunnelType',
--- a/netbox/vpn/tables/crypto.py
+++ b/netbox/vpn/tables/crypto.py
@@ -8,8 +8,8 @@ __all__ = (
    'IKEPolicyTable',
    'IKEProposalTable',
    'IPSecPolicyTable',
-    'IPSecProposalTable',
    'IPSecProfileTable',
+    'IPSecProposalTable',
 )


--- a/netbox/vpn/tables/tunnels.py
+++ b/netbox/vpn/tables/tunnels.py
@@ -7,8 +7,8 @@ from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin
 from vpn.models import *

 __all__ = (
-    'TunnelTable',
    'TunnelGroupTable',
+    'TunnelTable',
    'TunnelTerminationTable',
 )

--- a/netbox/wireless/forms/bulk_import.py
+++ b/netbox/wireless/forms/bulk_import.py
@@ -12,8 +12,8 @@ from wireless.choices import *
 from wireless.models import *

 __all__ = (
-    'WirelessLANImportForm',
    'WirelessLANGroupImportForm',
+    'WirelessLANImportForm',
    'WirelessLinkImportForm',
 )

--- a/netbox/wireless/graphql/filters.py
+++ b/netbox/wireless/graphql/filters.py
@@ -20,8 +20,8 @@ if TYPE_CHECKING:
    from .enums import *

 __all__ = (
-    'WirelessLANGroupFilter',
    'WirelessLANFilter',
+    'WirelessLANGroupFilter',
    'WirelessLinkFilter',
 )

--- a/netbox/wireless/graphql/types.py
+++ b/netbox/wireless/graphql/types.py
@@ -14,8 +14,8 @@ if TYPE_CHECKING:
    from tenancy.graphql.types import TenantType

 __all__ = (
-    'WirelessLANType',
    'WirelessLANGroupType',
+    'WirelessLANType',
    'WirelessLinkType',
 )

--- a/ruff.toml
+++ b/ruff.toml
@@ -35,20 +35,21 @@ target-version = "py312"
 # Keeping this explicit makes ruff deterministic.
 select = ["E4", "E7", "E9", "F"]
 extend-select = [
-    "E1",    # pycodestyle errors: indentation-related (e.g., unexpected/missing indent)
-    "E2",    # pycodestyle errors: whitespace-related (e.g., missing whitespace, extra spaces)
-    "E3",    # pycodestyle errors: blank lines / spacing around definitions
-    "E501",  # pycodestyle: line too long (enforced with `line-length` above)
-    "W",     # pycodestyle warnings (various style warnings, often whitespace/newlines)
-    "I",     # import sorting (isort-equivalent)
-    "RET",   # return semantics (flake8-return family: consistent/explicit returns; remove redundant else/assign before return)
-    "UP",    # pyupgrade: modernize syntax for your target Python (e.g., f-strings, built-in generics, newer stdlib idioms)
+    "E1",        # pycodestyle errors: indentation-related (e.g., unexpected/missing indent)
+    "E2",        # pycodestyle errors: whitespace-related (e.g., missing whitespace, extra spaces)
+    "E3",        # pycodestyle errors: blank lines / spacing around definitions
+    "E501",      # pycodestyle: line too long (enforced with `line-length` above)
+    "W",         # pycodestyle warnings (various style warnings, often whitespace/newlines)
+    "I",         # import sorting (isort-equivalent)
+    "RET",       # return semantics (flake8-return family: consistent/explicit returns; remove redundant else/assign before return)
+    "UP",        # pyupgrade: modernize syntax for your target Python (e.g., f-strings, built-in generics, newer stdlib idioms)
+    "RUF022",    # ruff: enforce sorted `__all__` lists
 ]
 ignore = [
-    "F403",  # pyflakes: `from ... import *` used; unable to detect undefined names
-    "F405",  # pyflakes: name may be undefined or defined from star imports
-    "RET504",  # return: unnecessary assignment before `return` (e.g., `x = expr; return x` -> `return expr`)
-    "UP032", # pyupgrade: prefer f-strings over `str.format(...)`
+    "F403",      # pyflakes: `from ... import *` used; unable to detect undefined names
+    "F405",      # pyflakes: name may be undefined or defined from star imports
+    "RET504",    # return: unnecessary assignment before `return` (e.g., `x = expr; return x` -> `return expr`)
+    "UP032",     # pyupgrade: prefer f-strings over `str.format(...)`
 ]
 preview = true