Rename PexInterpreterConstraints to InterpreterConstraints and move to dedicated file

src/python/pants/backend/awslambda/python/rules.py

@@ -12,8 +12,8 @@
     ResolvePythonAwsHandlerRequest,
 )
 from pants.backend.python.util_rules import pex_from_targets
+from pants.backend.python.util_rules.interpreter_constraints import InterpreterConstraints
 from pants.backend.python.util_rules.pex import (
-    PexInterpreterConstraints,
     PexPlatforms,
     PexRequest,
     PexRequirements,
@@ -96,7 +96,7 @@ async def package_python_awslambda(
         output_filename="lambdex.pex",
         internal_only=True,
         requirements=PexRequirements(lambdex.all_requirements),
-        interpreter_constraints=PexInterpreterConstraints(lambdex.interpreter_constraints),
+        interpreter_constraints=InterpreterConstraints(lambdex.interpreter_constraints),
         main=lambdex.main,
     )
 

src/python/pants/backend/codegen/protobuf/python/rules.py

@@ -13,8 +13,8 @@
 from pants.backend.codegen.protobuf.target_types import ProtobufGrpcToggle, ProtobufSources
 from pants.backend.python.target_types import PythonSources
 from pants.backend.python.util_rules import pex
+from pants.backend.python.util_rules.interpreter_constraints import InterpreterConstraints
 from pants.backend.python.util_rules.pex import (
-    PexInterpreterConstraints,
     PexRequest,
     PexRequirements,
     PexResolveInfo,
@@ -109,7 +109,7 @@ async def generate_python_from_protobuf(
         output_filename="mypy_protobuf.pex",
         internal_only=True,
         requirements=PexRequirements([python_protobuf_mypy_plugin.requirement]),
-        interpreter_constraints=PexInterpreterConstraints(
+        interpreter_constraints=InterpreterConstraints(
             python_protobuf_mypy_plugin.interpreter_constraints
         ),
     )

src/python/pants/backend/python/dependency_inference/import_parser.py

@@ -3,7 +3,7 @@
 
 from dataclasses import dataclass
 
-from pants.backend.python.util_rules.pex import PexInterpreterConstraints
+from pants.backend.python.util_rules.interpreter_constraints import InterpreterConstraints
 from pants.backend.python.util_rules.pex_environment import PythonExecutable
 from pants.core.util_rules.source_files import SourceFilesRequest
 from pants.core.util_rules.stripped_source_files import StrippedSourceFiles
@@ -143,14 +143,14 @@ class ParsedPythonImports(DeduplicatedCollection[str]):
 @dataclass(frozen=True)
 class ParsePythonImportsRequest:
     sources: Sources
-    interpreter_constraints: PexInterpreterConstraints
+    interpreter_constraints: InterpreterConstraints
     string_imports: bool
 
 
 @rule
 async def parse_python_imports(request: ParsePythonImportsRequest) -> ParsedPythonImports:
     python_interpreter, script_digest, stripped_sources = await MultiGet(
-        Get(PythonExecutable, PexInterpreterConstraints, request.interpreter_constraints),
+        Get(PythonExecutable, InterpreterConstraints, request.interpreter_constraints),
         Get(Digest, CreateDigest([FileContent("__parse_python_imports.py", _SCRIPT.encode())])),
         Get(StrippedSourceFiles, SourceFilesRequest([request.sources])),
     )

src/python/pants/backend/python/dependency_inference/import_parser_test.py

@@ -14,7 +14,7 @@
 )
 from pants.backend.python.target_types import PythonLibrary, PythonSources
 from pants.backend.python.util_rules import pex
-from pants.backend.python.util_rules.pex import PexInterpreterConstraints
+from pants.backend.python.util_rules.interpreter_constraints import InterpreterConstraints
 from pants.core.util_rules import stripped_source_files
 from pants.engine.addresses import Address
 from pants.testutil.python_interpreter_selection import (
@@ -58,7 +58,7 @@ def assert_imports_parsed(
         [
             ParsePythonImportsRequest(
                 tgt[PythonSources],
-                PexInterpreterConstraints([constraints]),
+                InterpreterConstraints([constraints]),
                 string_imports=string_imports,
             )
         ],

src/python/pants/backend/python/dependency_inference/rules.py

@@ -15,7 +15,7 @@
 from pants.backend.python.target_types import PythonSources, PythonTestsSources
 from pants.backend.python.util_rules import ancestor_files, pex
 from pants.backend.python.util_rules.ancestor_files import AncestorFiles, AncestorFilesRequest
-from pants.backend.python.util_rules.pex import PexInterpreterConstraints
+from pants.backend.python.util_rules.interpreter_constraints import InterpreterConstraints
 from pants.core.util_rules import stripped_source_files
 from pants.engine.addresses import Address
 from pants.engine.internals.graph import Owners, OwnersRequest
@@ -138,7 +138,7 @@ async def infer_python_dependencies_via_imports(
             ParsedPythonImports,
             ParsePythonImportsRequest(
                 request.sources_field,
-                PexInterpreterConstraints.create_from_targets([wrapped_tgt.target], python_setup),
+                InterpreterConstraints.create_from_targets([wrapped_tgt.target], python_setup),
                 string_imports=python_infer_subsystem.string_imports,
             ),
         ),

src/python/pants/backend/python/goals/coverage_py.py

@@ -14,13 +14,8 @@
 
 from pants.backend.python.subsystems.python_tool_base import PythonToolBase
 from pants.backend.python.target_types import ConsoleScript
-from pants.backend.python.util_rules.pex import (
-    PexInterpreterConstraints,
-    PexRequest,
-    PexRequirements,
-    VenvPex,
-    VenvPexProcess,
-)
+from pants.backend.python.util_rules.interpreter_constraints import InterpreterConstraints
+from pants.backend.python.util_rules.pex import PexRequest, PexRequirements, VenvPex, VenvPexProcess
 from pants.backend.python.util_rules.python_sources import (
     PythonSourceFiles,
     PythonSourceFilesRequest,
@@ -306,7 +301,7 @@ async def setup_coverage(coverage: CoverageSubsystem) -> CoverageSetup:
             output_filename="coverage.pex",
             internal_only=True,
             requirements=PexRequirements(coverage.all_requirements),
-            interpreter_constraints=PexInterpreterConstraints(coverage.interpreter_constraints),
+            interpreter_constraints=InterpreterConstraints(coverage.interpreter_constraints),
             main=coverage.main,
         ),
     )

src/python/pants/backend/python/goals/pytest_runner.py

@@ -19,9 +19,9 @@
     PythonTestsSources,
     PythonTestsTimeout,
 )
+from pants.backend.python.util_rules.interpreter_constraints import InterpreterConstraints
 from pants.backend.python.util_rules.pex import (
     Pex,
-    PexInterpreterConstraints,
     PexRequest,
     PexRequirements,
     VenvPex,
@@ -128,9 +128,7 @@ async def setup_pytest_for_target(
     )
     all_targets = transitive_targets.closure
 
-    interpreter_constraints = PexInterpreterConstraints.create_from_targets(
-        all_targets, python_setup
-    )
+    interpreter_constraints = InterpreterConstraints.create_from_targets(all_targets, python_setup)
 
     requirements_pex_get = Get(
         Pex,

src/python/pants/backend/python/goals/setup_py.py

@@ -23,13 +23,8 @@
     ResolvePexEntryPointRequest,
     SetupPyCommandsField,
 )
-from pants.backend.python.util_rules.pex import (
-    PexInterpreterConstraints,
-    PexRequest,
-    PexRequirements,
-    VenvPex,
-    VenvPexProcess,
-)
+from pants.backend.python.util_rules.interpreter_constraints import InterpreterConstraints
+from pants.backend.python.util_rules.pex import PexRequest, PexRequirements, VenvPex, VenvPexProcess
 from pants.backend.python.util_rules.python_sources import (
     PythonSourceFilesRequest,
     StrippedPythonSourceFiles,
@@ -290,7 +285,7 @@ class RunSetupPyRequest:
     """A request to run a setup.py command."""
 
     exported_target: ExportedTarget
-    interpreter_constraints: PexInterpreterConstraints
+    interpreter_constraints: InterpreterConstraints
     chroot: SetupPyChroot
     args: Tuple[str, ...]
 
@@ -365,7 +360,7 @@ async def package_python_dist(
 ) -> BuiltPackage:
     transitive_targets = await Get(TransitiveTargets, TransitiveTargetsRequest([field_set.address]))
     exported_target = ExportedTarget(transitive_targets.roots[0])
-    interpreter_constraints = PexInterpreterConstraints.create_from_targets(
+    interpreter_constraints = InterpreterConstraints.create_from_targets(
         transitive_targets.closure, python_setup
     )
     chroot = await Get(

src/python/pants/backend/python/lint/bandit/rules.py

@@ -8,13 +8,8 @@
 from pants.backend.python.lint.bandit.subsystem import Bandit
 from pants.backend.python.target_types import InterpreterConstraintsField, PythonSources
 from pants.backend.python.util_rules import pex
-from pants.backend.python.util_rules.pex import (
-    PexInterpreterConstraints,
-    PexRequest,
-    PexRequirements,
-    VenvPex,
-    VenvPexProcess,
-)
+from pants.backend.python.util_rules.interpreter_constraints import InterpreterConstraints
+from pants.backend.python.util_rules.pex import PexRequest, PexRequirements, VenvPex, VenvPexProcess
 from pants.core.goals.lint import LintReport, LintRequest, LintResult, LintResults, LintSubsystem
 from pants.core.util_rules.config_files import ConfigFiles, ConfigFilesRequest
 from pants.core.util_rules.source_files import SourceFiles, SourceFilesRequest
@@ -47,7 +42,7 @@ class BanditRequest(LintRequest):
 @dataclass(frozen=True)
 class BanditPartition:
     field_sets: Tuple[BanditFieldSet, ...]
-    interpreter_constraints: PexInterpreterConstraints
+    interpreter_constraints: InterpreterConstraints
 
 
 def generate_argv(
@@ -138,7 +133,7 @@ async def bandit_lint(
     # ( https://github.com/PyCQA/bandit#under-which-version-of-python-should-i-install-bandit). We
     # batch targets by their constraints to ensure, for example, that all Python 2 targets run
     # together and all Python 3 targets run together.
-    constraints_to_field_sets = PexInterpreterConstraints.group_field_sets_by_constraints(
+    constraints_to_field_sets = InterpreterConstraints.group_field_sets_by_constraints(
         request.field_sets, python_setup
     )
     partitioned_results = await MultiGet(

src/python/pants/backend/python/lint/black/rules.py

@@ -9,13 +9,8 @@
 from pants.backend.python.lint.python_fmt import PythonFmtRequest
 from pants.backend.python.target_types import InterpreterConstraintsField, PythonSources
 from pants.backend.python.util_rules import pex
-from pants.backend.python.util_rules.pex import (
-    PexInterpreterConstraints,
-    PexRequest,
-    PexRequirements,
-    VenvPex,
-    VenvPexProcess,
-)
+from pants.backend.python.util_rules.interpreter_constraints import InterpreterConstraints
+from pants.backend.python.util_rules.pex import PexRequest, PexRequirements, VenvPex, VenvPexProcess
 from pants.core.goals.fmt import FmtResult
 from pants.core.goals.lint import LintRequest, LintResult, LintResults
 from pants.core.util_rules.config_files import ConfigFiles, ConfigFilesRequest
@@ -78,7 +73,7 @@ async def setup_black(
     # when relevant. We only do this if if <3.8 can't be used, as we don't want a loose requirement
     # like `>=3.6` to result in requiring Python 3.8, which would error if 3.8 is not installed on
     # the machine.
-    all_interpreter_constraints = PexInterpreterConstraints.create_from_compatibility_fields(
+    all_interpreter_constraints = InterpreterConstraints.create_from_compatibility_fields(
         (field_set.interpreter_constraints for field_set in setup_request.request.field_sets),
         python_setup,
     )
@@ -88,7 +83,7 @@ async def setup_black(
             all_interpreter_constraints.requires_python38_or_newer()
             and black.options.is_default("interpreter_constraints")
         )
-        else PexInterpreterConstraints(black.interpreter_constraints)
+        else InterpreterConstraints(black.interpreter_constraints)
     )
 
     black_pex_get = Get(

src/python/pants/backend/python/lint/docformatter/rules.py

@@ -9,13 +9,8 @@
 from pants.backend.python.lint.python_fmt import PythonFmtRequest
 from pants.backend.python.target_types import PythonSources
 from pants.backend.python.util_rules import pex
-from pants.backend.python.util_rules.pex import (
-    PexInterpreterConstraints,
-    PexRequest,
-    PexRequirements,
-    VenvPex,
-    VenvPexProcess,
-)
+from pants.backend.python.util_rules.interpreter_constraints import InterpreterConstraints
+from pants.backend.python.util_rules.pex import PexRequest, PexRequirements, VenvPex, VenvPexProcess
 from pants.core.goals.fmt import FmtResult
 from pants.core.goals.lint import LintRequest, LintResult, LintResults
 from pants.core.util_rules.source_files import SourceFiles, SourceFilesRequest
@@ -69,7 +64,7 @@ async def setup_docformatter(setup_request: SetupRequest, docformatter: Docforma
             output_filename="docformatter.pex",
             internal_only=True,
             requirements=PexRequirements(docformatter.all_requirements),
-            interpreter_constraints=PexInterpreterConstraints(docformatter.interpreter_constraints),
+            interpreter_constraints=InterpreterConstraints(docformatter.interpreter_constraints),
             main=docformatter.main,
         ),
     )

src/python/pants/backend/python/lint/flake8/rules.py

@@ -8,13 +8,8 @@
 from pants.backend.python.lint.flake8.subsystem import Flake8
 from pants.backend.python.target_types import InterpreterConstraintsField, PythonSources
 from pants.backend.python.util_rules import pex
-from pants.backend.python.util_rules.pex import (
-    PexInterpreterConstraints,
-    PexRequest,
-    PexRequirements,
-    VenvPex,
-    VenvPexProcess,
-)
+from pants.backend.python.util_rules.interpreter_constraints import InterpreterConstraints
+from pants.backend.python.util_rules.pex import PexRequest, PexRequirements, VenvPex, VenvPexProcess
 from pants.core.goals.lint import LintReport, LintRequest, LintResult, LintResults, LintSubsystem
 from pants.core.util_rules.config_files import ConfigFiles, ConfigFilesRequest
 from pants.core.util_rules.source_files import SourceFiles, SourceFilesRequest
@@ -47,7 +42,7 @@ class Flake8Request(LintRequest):
 @dataclass(frozen=True)
 class Flake8Partition:
     field_sets: Tuple[Flake8FieldSet, ...]
-    interpreter_constraints: PexInterpreterConstraints
+    interpreter_constraints: InterpreterConstraints
 
 
 def generate_argv(
@@ -136,7 +131,7 @@ async def flake8_lint(
     # (http://flake8.pycqa.org/en/latest/user/invocation.html). We batch targets by their
     # constraints to ensure, for example, that all Python 2 targets run together and all Python 3
     # targets run together.
-    constraints_to_field_sets = PexInterpreterConstraints.group_field_sets_by_constraints(
+    constraints_to_field_sets = InterpreterConstraints.group_field_sets_by_constraints(
         request.field_sets, python_setup
     )
     partitioned_results = await MultiGet(

src/python/pants/backend/python/lint/isort/rules.py

@@ -9,8 +9,8 @@
 from pants.backend.python.lint.python_fmt import PythonFmtRequest
 from pants.backend.python.target_types import PythonSources
 from pants.backend.python.util_rules import pex
+from pants.backend.python.util_rules.interpreter_constraints import InterpreterConstraints
 from pants.backend.python.util_rules.pex import (
-    PexInterpreterConstraints,
     PexRequest,
     PexRequirements,
     PexResolveInfo,
@@ -90,7 +90,7 @@ async def setup_isort(setup_request: SetupRequest, isort: Isort) -> Setup:
             output_filename="isort.pex",
             internal_only=True,
             requirements=PexRequirements(isort.all_requirements),
-            interpreter_constraints=PexInterpreterConstraints(isort.interpreter_constraints),
+            interpreter_constraints=InterpreterConstraints(isort.interpreter_constraints),
             main=isort.main,
         ),
     )

src/python/pants/backend/python/lint/pylint/rules.py

@@ -13,9 +13,9 @@
     PythonSources,
 )
 from pants.backend.python.util_rules import pex_from_targets
+from pants.backend.python.util_rules.interpreter_constraints import InterpreterConstraints
 from pants.backend.python.util_rules.pex import (
     Pex,
-    PexInterpreterConstraints,
     PexRequest,
     PexRequirements,
     VenvPex,
@@ -73,13 +73,13 @@ class PylintTargetSetup:
 class PylintPartition:
     field_sets: Tuple[PylintFieldSet, ...]
     targets_with_dependencies: Targets
-    interpreter_constraints: PexInterpreterConstraints
+    interpreter_constraints: InterpreterConstraints
     plugin_targets: Targets
 
     def __init__(
         self,
         target_setups: Iterable[PylintTargetSetup],
-        interpreter_constraints: PexInterpreterConstraints,
+        interpreter_constraints: InterpreterConstraints,
         plugin_targets: Iterable[Target],
     ) -> None:
         field_sets = []
@@ -261,7 +261,7 @@ async def pylint_lint(
         request.field_sets, linted_targets, per_target_dependencies
     ):
         target_setup = PylintTargetSetup(field_set, Targets([tgt, *dependencies]))
-        interpreter_constraints = PexInterpreterConstraints.create_from_compatibility_fields(
+        interpreter_constraints = InterpreterConstraints.create_from_compatibility_fields(
             (
                 *(
                     tgt[InterpreterConstraintsField]