Skip to content

Commit fc573b7

Browse files
jerabekjirijerabekjiri
authored
Ruff 0.8.0 failures (#2371)
* unpin ruff * extend ignore * fix A004 * fix UP006 * fix UP031 * fix UP035 * fix RUF022
1 parent 4bed70a commit fc573b7

File tree

22 files changed

+150
-163
lines changed

22 files changed

+150
-163
lines changed

‎galaxy_ng/app/api/exceptions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def _handle_drf_api_exception(exc):
3333
if getattr(exc, 'auth_header', None):
3434
headers['WWW-Authenticate'] = exc.auth_header
3535
if getattr(exc, 'wait', None):
36-
headers['Retry-After'] = '%d' % exc.wait
36+
headers['Retry-After'] = str(exc.wait)
3737

3838
title = exc.__class__.default_detail
3939
errors = _get_errors(exc.detail, status=exc.status_code, title=title)

‎galaxy_ng/app/api/ui/v1/serializers/__init__.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,29 +37,29 @@
3737
)
3838

3939
__all__ = (
40-
# auth
41-
'LoginSerializer',
4240
# collection
4341
'CollectionDetailSerializer',
4442
'CollectionListSerializer',
45-
'CollectionVersionSerializer',
46-
'CollectionVersionDetailSerializer',
4743
'CollectionVersionBaseSerializer',
48-
# imports
49-
'ImportTaskDetailSerializer',
50-
'ImportTaskListSerializer',
44+
'CollectionVersionDetailSerializer',
45+
'CollectionVersionSerializer',
46+
# container
47+
'ContainerRegistryRemoteSerializer',
48+
'ContainerRemoteSerializer',
5149
# current_user
5250
'CurrentUserSerializer',
53-
# user
54-
'UserSerializer',
55-
# synclist
56-
'SyncListSerializer',
57-
'SyncListCollectionSummarySerializer',
5851
# distribution
5952
'DistributionSerializer',
60-
# container
61-
'ContainerRegistryRemoteSerializer',
62-
'ContainerRemoteSerializer',
53+
# imports
54+
'ImportTaskDetailSerializer',
55+
'ImportTaskListSerializer',
56+
# auth
57+
'LoginSerializer',
6358
# Search
6459
'SearchResultsSerializer',
60+
'SyncListCollectionSummarySerializer',
61+
# synclist
62+
'SyncListSerializer',
63+
# user
64+
'UserSerializer',
6565
)

‎galaxy_ng/app/api/ui/v1/views/__init__.py

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,37 +25,28 @@
2525

2626

2727
__all__ = (
28-
# auth
29-
"LoginView",
30-
"LogoutView",
31-
32-
# feature_flags
33-
"FeatureFlagsView",
34-
35-
# controller
36-
"ControllerListView",
37-
38-
# settings
39-
"SettingsView",
40-
41-
# landing_page
42-
"LandingPageView",
43-
28+
# AI/Wisdom
29+
"AIDenyIndexAddView",
30+
"AIDenyIndexDetailView",
31+
"AIDenyIndexListView",
32+
# Signing
33+
"CollectionSignView",
4434
# sync
4535
"ContainerSyncRegistryView",
46-
36+
# controller
37+
"ControllerListView",
38+
# feature_flags
39+
"FeatureFlagsView",
4740
# index_execution_environments
4841
"IndexRegistryEEView",
49-
50-
# Signing
51-
"CollectionSignView",
52-
53-
# AI/Wisdom
54-
"AIDenyIndexAddView",
55-
"AIDenyIndexListView",
56-
"AIDenyIndexDetailView",
57-
42+
# landing_page
43+
"LandingPageView",
44+
# auth
45+
"LoginView",
46+
"LogoutView",
5847
# Search
5948
"SearchListView",
49+
# settings
50+
"SettingsView",
6051

6152
)

‎galaxy_ng/app/api/ui/v1/views/feature_flags.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def _load_conditional_signing_flags(flags):
3838
# Is the system enabled to accept signature uploads?
3939
can_upload = flags.setdefault(
4040
"can_upload_signatures",
41-
enabled and require_upload or bool(settings.get("GALAXY_SIGNATURE_UPLOAD_ENABLED"))
41+
(enabled and require_upload) or bool(settings.get("GALAXY_SIGNATURE_UPLOAD_ENABLED"))
4242
)
4343

4444
# Is the system configured with a Signing Service to create signatures?

‎galaxy_ng/app/api/ui/v1/viewsets/__init__.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,24 @@
2626
)
2727

2828
__all__ = (
29-
'NamespaceViewSet',
30-
'MyNamespaceViewSet',
31-
'MySyncListViewSet',
32-
'CollectionViewSet',
33-
'CollectionVersionViewSet',
29+
'APIRootView',
3430
'CollectionImportViewSet',
3531
'CollectionRemoteViewSet',
36-
'TagsViewSet',
32+
'CollectionVersionViewSet',
33+
'CollectionViewSet',
3734
'CollectionsTagsViewSet',
38-
'RolesTagsViewSet',
35+
'ContainerRegistryRemoteViewSet',
36+
'ContainerRemoteViewSet',
3937
'CurrentUserViewSet',
40-
'UserViewSet',
41-
'SyncListViewSet',
42-
'APIRootView',
43-
'GroupViewSet',
44-
'GroupUserViewSet',
4538
'DistributionViewSet',
39+
'GroupUserViewSet',
40+
'GroupViewSet',
4641
'MyDistributionViewSet',
47-
'ContainerRegistryRemoteViewSet',
48-
'ContainerRemoteViewSet',
42+
'MyNamespaceViewSet',
43+
'MySyncListViewSet',
44+
'NamespaceViewSet',
45+
'RolesTagsViewSet',
46+
'SyncListViewSet',
47+
'TagsViewSet',
48+
'UserViewSet',
4949
)

‎galaxy_ng/app/api/v1/viewsets/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121

2222

2323
__all__ = (
24-
"LegacyNamespacesViewSet",
2524
"LegacyNamespaceOwnersViewSet",
2625
"LegacyNamespaceProvidersViewSet",
27-
"LegacyUsersViewSet",
28-
"LegacyRolesViewSet",
29-
"LegacyRolesSyncViewSet",
26+
"LegacyNamespacesViewSet",
3027
"LegacyRoleContentViewSet",
31-
"LegacyRoleVersionsViewSet",
3228
"LegacyRoleImportsViewSet",
29+
"LegacyRoleVersionsViewSet",
30+
"LegacyRolesSyncViewSet",
31+
"LegacyRolesViewSet",
32+
"LegacyUsersViewSet",
3333
)

‎galaxy_ng/app/api/v3/serializers/__init__.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@
2828
__all__ = (
2929
# collection
3030
"CollectionUploadSerializer",
31+
"ContainerManifestDetailSerializer",
32+
"ContainerManifestSerializer",
33+
"ContainerReadmeSerializer",
34+
"ContainerRepositoryHistorySerializer",
35+
# execution_environment
36+
"ContainerRepositorySerializer",
37+
"ContainerTagSerializer",
38+
# group
39+
"GroupSummarySerializer",
3140
# namespace
3241
"NamespaceSerializer",
3342
"NamespaceSummarySerializer",
34-
# group
35-
"GroupSummarySerializer",
3643
# task
3744
"TaskSerializer",
3845
"TaskSummarySerializer",
39-
# execution_environment
40-
"ContainerRepositorySerializer",
41-
"ContainerTagSerializer",
42-
"ContainerManifestSerializer",
43-
"ContainerManifestDetailSerializer",
44-
"ContainerReadmeSerializer",
45-
"ContainerRepositoryHistorySerializer",
4646
)

‎galaxy_ng/app/api/v3/serializers/execution_environment.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ def get_pulp(self, distro):
119119
remote = ui_serializers.ContainerRemoteSerializer(
120120
repo.remote.cast(), context=self.context).data
121121

122-
sign_state = repo.content.filter(
122+
sign_state = (repo.content.filter(
123123
pulp_type="container.signature"
124-
).count() > 0 and "signed" or "unsigned"
124+
).count() > 0 and "signed") or "unsigned"
125125

126126
return {
127127
"repository": {

‎galaxy_ng/app/api/v3/serializers/task.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import logging
2-
from typing import Any, Dict, Optional
2+
from typing import Any, Optional
33
from rest_framework import serializers
44
from rest_framework.reverse import reverse
55
from drf_spectacular.utils import extend_schema_field
@@ -21,7 +21,7 @@ class TaskSerializer(serializers.ModelSerializer):
2121
started_at = serializers.DateTimeField()
2222
finished_at = serializers.DateTimeField()
2323

24-
@extend_schema_field(Optional[Dict[str, Any]])
24+
@extend_schema_field(Optional[dict[str, Any]])
2525
def get_worker(self, obj):
2626
if obj.worker:
2727
return {

‎galaxy_ng/app/api/v3/views/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
from .sync import ContainerSyncRemoteView
66

77

8-
__all__ = ("TokenView", "SyncRemoteView", "ExcludesView", "NotFoundView", "ContainerSyncRemoteView")
8+
__all__ = ("ContainerSyncRemoteView", "ExcludesView", "NotFoundView", "SyncRemoteView", "TokenView")

‎galaxy_ng/app/api/v3/views/excludes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ def get_synclist_excludes(base_path):
2626

2727
def serialize_collection_queryset(queryset):
2828
"""Serialize a Queryset in to a JSONable format."""
29-
return queryset is not None and [
29+
return (queryset is not None and [
3030
{
3131
"name": "{collection.namespace}.{collection.name}".format(collection=collection)
3232
}
3333
for collection in queryset.all()
34-
] or []
34+
]) or []
3535

3636

3737
class RequirementsFileRenderer(BaseRenderer):

‎galaxy_ng/app/api/v3/viewsets/__init__.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
# collection
2020
"CollectionArtifactDownloadView",
2121
"CollectionUploadViewSet",
22-
"CollectionVersionMoveViewSet",
2322
"CollectionVersionCopyViewSet",
23+
"CollectionVersionMoveViewSet",
24+
"ContainerReadmeViewSet",
25+
"ContainerRepositoryHistoryViewSet",
26+
"ContainerRepositoryManifestViewSet",
27+
# execution_environments
28+
"ContainerRepositoryViewSet",
29+
"ContainerTagViewset",
2430
# namespace
2531
"NamespaceViewSet",
26-
# task
27-
"TaskViewSet",
2832
# sync
2933
"SyncConfigViewSet",
30-
# execution_environments
31-
"ContainerRepositoryViewSet",
32-
"ContainerRepositoryManifestViewSet",
33-
"ContainerRepositoryHistoryViewSet",
34-
"ContainerReadmeViewSet",
35-
"ContainerTagViewset",
34+
# task
35+
"TaskViewSet",
3636
)

0 commit comments

Comments
 (0)