Cherry-adapt from #16934

kaos · kaos · commit 717e71e0403e · 2022-10-17T11:34:13.000-04:00
diff --git a/src/python/pants/backend/python/goals/lockfile.py b/src/python/pants/backend/python/goals/lockfile.py
@@ -272,15 +272,18 @@ async def setup_user_lockfile_requests(
 
 @dataclass(frozen=True)
 class PythonSyntheticLockfileTargetsRequest(SyntheticTargetsRequest):
-    path: str = ""  # Indicate that all targets are provided with a single request.
+    path: str = SyntheticTargetsRequest.SINGLE_REQUEST_FOR_ALL_TARGETS
 
 
 @rule
 async def python_lockfile_synthetic_targets(
     request: PythonSyntheticLockfileTargetsRequest,
     python_setup: PythonSetup,
 ) -> SyntheticAddressMaps:
-    if not python_setup.enable_resolves:
+    if (
+        not python_setup.enable_resolves
+        or request.path != SyntheticTargetsRequest.SINGLE_REQUEST_FOR_ALL_TARGETS
+    ):
         return SyntheticAddressMaps()
 
     resolves = [
diff --git a/src/python/pants/backend/python/macros/pipenv_requirements.py b/src/python/pants/backend/python/macros/pipenv_requirements.py
@@ -13,6 +13,7 @@
     TypeStubsModuleMappingField,
 )
 from pants.backend.python.pip_requirement import PipRequirement
+from pants.backend.python.subsystems.setup import PythonSetup
 from pants.backend.python.target_types import (
     PythonRequirementModulesField,
     PythonRequirementResolveField,
@@ -70,7 +71,9 @@ class GenerateFromPipenvRequirementsRequest(GenerateTargetsRequest):
 # TODO(#10655): differentiate between Pipfile vs. Pipfile.lock.
 @rule(desc="Generate `python_requirement` targets from Pipfile.lock", level=LogLevel.DEBUG)
 async def generate_from_pipenv_requirement(
-    request: GenerateFromPipenvRequirementsRequest, union_membership: UnionMembership
+    request: GenerateFromPipenvRequirementsRequest,
+    union_membership: UnionMembership,
+    python_setup: PythonSetup,
 ) -> GeneratedTargets:
     generator = request.generator
     lock_rel_path = generator[PipenvSourceField].value
@@ -90,6 +93,15 @@ async def generate_from_pipenv_requirement(
         union_membership,
     )
 
+    req_deps = [file_tgt.address.spec]
+
+    resolve = request.template.get(
+        PythonRequirementResolveField.alias, python_setup.default_resolve
+    )
+    lockfile = python_setup.resolves.get(resolve) if python_setup.enable_resolves else None
+    if lockfile:
+        req_deps.append(f"{lockfile}:{resolve}")
+
     digest_contents = await Get(
         DigestContents,
         PathGlobs(
@@ -106,9 +118,7 @@ def generate_tgt(parsed_req: PipRequirement) -> PythonRequirementTarget:
         normalized_proj_name = canonicalize_project_name(parsed_req.project_name)
         tgt_overrides = overrides.pop(normalized_proj_name, {})
         if Dependencies.alias in tgt_overrides:
-            tgt_overrides[Dependencies.alias] = list(tgt_overrides[Dependencies.alias]) + [
-                file_tgt.address.spec
-            ]
+            tgt_overrides[Dependencies.alias] = list(tgt_overrides[Dependencies.alias]) + req_deps
 
         return PythonRequirementTarget(
             {
@@ -120,7 +130,7 @@ def generate_tgt(parsed_req: PipRequirement) -> PythonRequirementTarget:
                 ),
                 # This may get overridden by `tgt_overrides`, which will have already added in
                 # the file tgt.
-                Dependencies.alias: [file_tgt.address.spec],
+                Dependencies.alias: req_deps,
                 **tgt_overrides,
             },
             request.template_address.create_generated(parsed_req.project_name),
diff --git a/src/python/pants/backend/python/macros/pipenv_requirements_test.py b/src/python/pants/backend/python/macros/pipenv_requirements_test.py
@@ -48,8 +48,8 @@ def assert_pipenv_requirements(
 
 
 def test_pipfile_lock(rule_runner: RuleRunner) -> None:
-    """This tests that we correctly create a new python_requirement_library for each entry in a
-    Pipfile.lock file.
+    """This tests that we correctly create a new python_requirement for each entry in a Pipfile.lock
+    file.
 
     Edge cases:
 
@@ -89,3 +89,45 @@ def test_pipfile_lock(rule_runner: RuleRunner) -> None:
             TargetGeneratorSourcesHelperTarget({"source": "Pipfile.lock"}, file_addr),
         },
     )
+
+
+def test_pipfile_lockfile_dependency(rule_runner: RuleRunner) -> None:
+    """This tests that we adds a dependency on the lockfile for the resolve for each generated
+    python_requirement."""
+    rule_runner.set_options(["--python-enable-resolves"])
+    file_addr = Address("", target_name="reqs", relative_file_path="Pipfile.lock")
+    lock_addr = Address(
+        "3rdparty/python", target_name="python-default", relative_file_path="default.lock"
+    )
+    assert_pipenv_requirements(
+        rule_runner,
+        "pipenv_requirements(name='reqs', module_mapping={'ansicolors': ['colors']})",
+        {
+            "default": {"ansicolors": {"version": ">=1.18.0"}},
+            "develop": {
+                "cachetools": {
+                    "markers": "python_version ~= '3.5'",
+                    "version": "==4.1.1",
+                    "extras": ["ring", "mongo"],
+                }
+            },
+        },
+        expected_targets={
+            PythonRequirementTarget(
+                {
+                    "requirements": ["ansicolors>=1.18.0"],
+                    "modules": ["colors"],
+                    "dependencies": [file_addr.spec, lock_addr.spec],
+                },
+                Address("", target_name="reqs", generated_name="ansicolors"),
+            ),
+            PythonRequirementTarget(
+                {
+                    "requirements": ["cachetools[ring, mongo]==4.1.1;python_version ~= '3.5'"],
+                    "dependencies": [file_addr.spec, lock_addr.spec],
+                },
+                Address("", target_name="reqs", generated_name="cachetools"),
+            ),
+            TargetGeneratorSourcesHelperTarget({"source": file_addr.filename}, file_addr),
+        },
+    )
diff --git a/src/python/pants/backend/python/macros/poetry_requirements.py b/src/python/pants/backend/python/macros/poetry_requirements.py
@@ -21,6 +21,7 @@
     TypeStubsModuleMappingField,
 )
 from pants.backend.python.pip_requirement import PipRequirement
+from pants.backend.python.subsystems.setup import PythonSetup
 from pants.backend.python.target_types import (
     PythonRequirementModulesField,
     PythonRequirementResolveField,
@@ -457,6 +458,7 @@ async def generate_from_python_requirement(
     request: GenerateFromPoetryRequirementsRequest,
     build_root: BuildRoot,
     union_membership: UnionMembership,
+    python_setup: PythonSetup,
 ) -> GeneratedTargets:
     generator = request.generator
     pyproject_rel_path = generator[PoetryRequirementsSourceField].value
@@ -476,6 +478,15 @@ async def generate_from_python_requirement(
         union_membership,
     )
 
+    req_deps = [file_tgt.address.spec]
+
+    resolve = request.template.get(
+        PythonRequirementResolveField.alias, python_setup.default_resolve
+    )
+    lockfile = python_setup.resolves.get(resolve) if python_setup.enable_resolves else None
+    if lockfile:
+        req_deps.append(f"{lockfile}:{resolve}")
+
     digest_contents = await Get(
         DigestContents,
         PathGlobs(
@@ -500,9 +511,7 @@ def generate_tgt(parsed_req: PipRequirement) -> PythonRequirementTarget:
         normalized_proj_name = canonicalize_project_name(parsed_req.project_name)
         tgt_overrides = overrides.pop(normalized_proj_name, {})
         if Dependencies.alias in tgt_overrides:
-            tgt_overrides[Dependencies.alias] = list(tgt_overrides[Dependencies.alias]) + [
-                file_tgt.address.spec
-            ]
+            tgt_overrides[Dependencies.alias] = list(tgt_overrides[Dependencies.alias]) + req_deps
 
         return PythonRequirementTarget(
             {
@@ -514,7 +523,7 @@ def generate_tgt(parsed_req: PipRequirement) -> PythonRequirementTarget:
                 ),
                 # This may get overridden by `tgt_overrides`, which will have already added in
                 # the file tgt.
-                Dependencies.alias: [file_tgt.address.spec],
+                Dependencies.alias: req_deps,
                 **tgt_overrides,
             },
             request.template_address.create_generated(parsed_req.project_name),
diff --git a/src/python/pants/backend/python/macros/poetry_requirements_test.py b/src/python/pants/backend/python/macros/poetry_requirements_test.py
@@ -555,6 +555,35 @@ def test_source_override(rule_runner: RuleRunner) -> None:
     )
 
 
+def test_lockfile_dependency(rule_runner: RuleRunner) -> None:
+    rule_runner.set_options(["--python-enable-resolves"])
+    file_addr = Address("", target_name="reqs", relative_file_path="pyproject.toml")
+    lock_addr = Address(
+        "3rdparty/python", target_name="python-default", relative_file_path="default.lock"
+    )
+    assert_poetry_requirements(
+        rule_runner,
+        "poetry_requirements(name='reqs')",
+        dedent(
+            """\
+            [tool.poetry.dependencies]
+            ansicolors = ">=1.18.0"
+            [tool.poetry.dev-dependencies]
+            """
+        ),
+        expected_targets={
+            PythonRequirementTarget(
+                {
+                    "dependencies": [file_addr.spec, lock_addr.spec],
+                    "requirements": ["ansicolors>=1.18.0"],
+                },
+                address=Address("", target_name="reqs", generated_name="ansicolors"),
+            ),
+            TargetGeneratorSourcesHelperTarget({"source": file_addr.filename}, file_addr),
+        },
+    )
+
+
 def test_non_pep440_error(rule_runner: RuleRunner) -> None:
     with engine_error(contains='Failed to parse requirement foo = "~r62b" in pyproject.toml'):
         assert_poetry_requirements(
diff --git a/src/python/pants/backend/python/macros/python_requirements_test.py b/src/python/pants/backend/python/macros/python_requirements_test.py
@@ -191,3 +191,26 @@ def test_source_override(rule_runner: RuleRunner) -> None:
             TargetGeneratorSourcesHelperTarget({"source": "subdir/requirements.txt"}, file_addr),
         },
     )
+
+
+def test_lockfile_dependency(rule_runner: RuleRunner) -> None:
+    rule_runner.set_options(["--python-enable-resolves"])
+    reqs_addr = Address("", target_name="reqs", relative_file_path="requirements.txt")
+    lock_addr = Address(
+        "3rdparty/python", target_name="python-default", relative_file_path="default.lock"
+    )
+    assert_python_requirements(
+        rule_runner,
+        "python_requirements(name='reqs')",
+        "ansicolors>=1.18.0",
+        expected_targets={
+            PythonRequirementTarget(
+                {
+                    "requirements": ["ansicolors>=1.18.0"],
+                    "dependencies": [reqs_addr.spec, lock_addr.spec],
+                },
+                Address("", target_name="reqs", generated_name="ansicolors"),
+            ),
+            TargetGeneratorSourcesHelperTarget({"source": reqs_addr.filename}, reqs_addr),
+        },
+    )
