Skip to content

Commit 9dd0344

Browse files
committed
refactor: reorder DockerImageBuildPullOptionField import and clean up subclass check
1 parent 9edbb5c commit 9dd0344

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

src/python/pants/backend/docker/goals/package_image.py

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
DockerBuildOptionFieldMultiValueMixin,
2626
DockerBuildOptionFieldValueMixin,
2727
DockerBuildOptionFlagFieldMixin,
28+
DockerImageBuildPullOptionField,
2829
DockerImageContextRootField,
2930
DockerImageRegistriesField,
3031
DockerImageRepositoryField,
3132
DockerImageSourceField,
3233
DockerImageTagsField,
3334
DockerImageTagsRequest,
3435
DockerImageTargetStageField,
35-
DockerImageBuildPullOptionField,
3636
get_docker_image_tags,
3737
)
3838
from pants.backend.docker.util_rules.docker_binary import DockerBinary
@@ -337,19 +337,17 @@ def get_build_options(
337337
# Case where BuildKit option has a default value - still should not be generated
338338
continue
339339

340-
if (
341-
issubclass(
342-
field_type,
343-
(
344-
DockerBuildOptionFieldMixin,
345-
DockerBuildOptionFieldMultiValueDictMixin,
346-
DockerBuildOptionFieldListOfMultiValueDictMixin,
347-
DockerBuildOptionFieldValueMixin,
348-
DockerBuildOptionFieldMultiValueMixin,
349-
DockerBuildOptionFlagFieldMixin,
350-
DockerImageBuildPullOptionField
351-
),
352-
)
340+
if issubclass(
341+
field_type,
342+
(
343+
DockerBuildOptionFieldMixin,
344+
DockerBuildOptionFieldMultiValueDictMixin,
345+
DockerBuildOptionFieldListOfMultiValueDictMixin,
346+
DockerBuildOptionFieldValueMixin,
347+
DockerBuildOptionFieldMultiValueMixin,
348+
DockerBuildOptionFlagFieldMixin,
349+
DockerImageBuildPullOptionField,
350+
),
353351
):
354352
source = InterpolationContext.TextSource(
355353
address=target.address, target_alias=target.alias, field_alias=field_type.alias

0 commit comments

Comments
 (0)