add pants.util.enums dep to BUILD files

pantsbuild · Nov 25, 2019 · 4e99376 · 4e99376
1 parent 4b9e9c8
commit 4e99376
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 5 deletions.
diff --git a/src/python/pants/backend/jvm/tasks/BUILD b/src/python/pants/backend/jvm/tasks/BUILD
@@ -550,6 +550,7 @@ python_library(
     'src/python/pants/java:util',
     'src/python/pants/process',
     'src/python/pants/task',
+    'src/python/pants/util:enums',
   ],
   tags = {"partially_type_checked"},
 )

diff --git a/src/python/pants/backend/jvm/tasks/jvm_compile/BUILD b/src/python/pants/backend/jvm/tasks/jvm_compile/BUILD
@@ -60,6 +60,7 @@ python_library(
     'src/python/pants/util:collections',
     'src/python/pants/util:contextutil',
     'src/python/pants/util:dirutil',
+    'src/python/pants/util:enums',
     'src/python/pants/util:fileutil',
     'src/python/pants/util:memo',
   ],

diff --git a/src/python/pants/backend/jvm/tasks/jvm_compile/rsc/rsc_compile.py b/src/python/pants/backend/jvm/tasks/jvm_compile/rsc/rsc_compile.py
@@ -175,12 +175,12 @@ def register_options(cls, register):
            'specified on the cli.')
 
     register('--workflow', type=cls.JvmCompileWorkflowType,
-      choices=cls.JvmCompileWorkflowType.all_values(),
+      choices=list(cls.JvmCompileWorkflowType),
       default=cls.JvmCompileWorkflowType.zinc_only, metavar='<workflow>',
       help='The default workflow to use to compile JVM targets. This is overriden on a per-target basis with the force-compiler-tag-prefix tag.', fingerprint=True)
 
     register('--scala-workflow-override', type=cls.JvmCompileWorkflowType,
-      choices=cls.JvmCompileWorkflowType.all_values(),
+      choices=list(cls.JvmCompileWorkflowType),
       default=None, metavar='<workflow_override>',
       help='Experimental option. The workflow to use to compile Scala targets, overriding the "workflow" option as well as any force-compiler-tag-prefix tags applied to targets. An example use case is to quickly turn off outlining workflows in case of errors.', fingerprint=True)
 

diff --git a/src/python/pants/backend/native/subsystems/BUILD b/src/python/pants/backend/native/subsystems/BUILD
@@ -13,6 +13,7 @@ python_library(
     'src/python/pants/engine:selectors',
     'src/python/pants/subsystem',
     'src/python/pants/util:collections',
+    'src/python/pants/util:enums',
     'src/python/pants/util:memo',
     'src/python/pants/util:meta',
   ],

diff --git a/src/python/pants/backend/native/subsystems/binaries/BUILD b/src/python/pants/backend/native/subsystems/binaries/BUILD
@@ -10,6 +10,7 @@ python_library(
     'src/python/pants/engine:rules',
     'src/python/pants/engine:platform',
     'src/python/pants/util:dirutil',
+    'src/python/pants/util:enums',
     'src/python/pants/util:memo',
   ],
   tags = {"partially_type_checked"},

diff --git a/src/python/pants/backend/native/targets/BUILD b/src/python/pants/backend/native/targets/BUILD
@@ -11,6 +11,7 @@ python_library(
     'src/python/pants/base:payload_field',
     'src/python/pants/build_graph',
     'src/python/pants/engine:platform',
+    'src/python/pants/util:enums',
     'src/python/pants/util:memo',
   ],
   tags = {"partially_type_checked"},

diff --git a/src/python/pants/backend/native/tasks/BUILD b/src/python/pants/backend/native/tasks/BUILD
@@ -16,6 +16,7 @@ python_library(
     'src/python/pants/task',
     'src/python/pants/util:collections',
     'src/python/pants/util:contextutil',
+    'src/python/pants/util:enums',
     'src/python/pants/util:memo',
     'src/python/pants/util:objects',
     'src/python/pants/util:strutil',

diff --git a/src/python/pants/backend/project_info/rules/BUILD b/src/python/pants/backend/project_info/rules/BUILD
@@ -10,6 +10,7 @@ python_library(
     'src/python/pants/rules/core',
     'src/python/pants/subsystem',
     'src/python/pants/util:collections',
+    'src/python/pants/util:enums',
     'src/python/pants/util:memo',
   ],
 )

diff --git a/tests/python/pants_test/backend/jvm/tasks/jvm_compile/rsc/rsc_compile_integration_base.py b/tests/python/pants_test/backend/jvm/tasks/jvm_compile/rsc/rsc_compile_integration_base.py
@@ -13,7 +13,7 @@ def ensure_compile_rsc_execution_strategy(workflow, **env_kwargs):
 
   def decorator(f):
     def wrapper(self, *args, **kwargs):
-      for strategy in RscCompile.ExecutionStrategy.all_values():
+      for strategy in RscCompile.ExecutionStrategy:
         with environment_as(
           HERMETIC_ENV='PANTS_COMPILE_RSC_EXECUTION_STRATEGY',
           PANTS_COMPILE_RSC_EXECUTION_STRATEGY=strategy.value,
@@ -24,7 +24,7 @@ def wrapper(self, *args, **kwargs):
 
     return wrapper
   return decorator
-  
+
 
 class RscCompileIntegrationBase(BaseCompileIT):
 

diff --git a/tests/python/pants_test/backend/python/tasks/native/BUILD b/tests/python/pants_test/backend/python/tasks/native/BUILD
@@ -42,6 +42,7 @@ python_tests(
     'src/python/pants/backend/python/tasks',
     'src/python/pants/util:contextutil',
     'src/python/pants/testutil:int-test',
+    'src/python/pants/util:enums',
     'tests/python/pants_test/backend/python/tasks/util',
     'tests/python/pants_test/engine:scheduler_test_base',
     'testprojects/src/python:python_distribution_directory',

diff --git a/tests/python/pants_test/backend/python/tasks/util/BUILD b/tests/python/pants_test/backend/python/tasks/util/BUILD
@@ -3,6 +3,7 @@ python_library(
     'src/python/pants/backend/native',
     'src/python/pants/backend/python/tasks',
     'src/python/pants/util:collections',
+    'src/python/pants/util:enums',
     'src/python/pants/util:meta',
     'tests/python/pants_test/backend/python/tasks:python_task_test_base',
     'tests/python/pants_test/engine:scheduler_test_base',

diff --git a/tests/python/pants_test/util/test_meta.py b/tests/python/pants_test/util/test_meta.py
@@ -1,7 +1,6 @@
 # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
-
 import unittest
 from abc import ABC, abstractmethod
 from dataclasses import FrozenInstanceError, dataclass