[internal] Refactor consumption of JVM tool lockfiles #14239
Conversation
The type is only being used to set up tools—whether those be external like Scalafmt or internal like our JVM parser. This rename makes that clear, which will allow us to start adding tool-specific functionality. # Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
This is how we've been using it de facto, including in two rules where there are 2 tools used in the same process. This allows us to simplify callsites / remove verbosity # Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
This is necessary to not break caching. # Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
|
👀 |
# Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
# Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
| @@ -680,16 +681,13 @@ class MaterializedClasspathRequest: | |||
| """ | |||
|
|
|||
| prefix: str | None = None | |||
| lockfiles: tuple[CoursierResolvedLockfile, ...] = () | |||
| artifact_requirements: tuple[ArtifactRequirements, ...] = () | |||
| lockfile: CoursierResolvedLockfile = CoursierResolvedLockfile(entries=()) | |||
There was a problem hiding this comment.
this is SO much clearer. Nice.
While there have been a lot of good cleanups, it would be good to connect further cleanup to the next feature we're trying to implement here. AFAICT, #13374 is finished, and we don't have any more lockfile stuff scheduled on the JVM side (https://github.com/pantsbuild/pants/projects/22?fullscreen=true). |
|
Things are still broken:
This is all in service of fixing that. Along with making things better than they were before - Chris and I collectively spent two weeks on this lockfile code because we were confused, so we're trying to clean things up so the next person in the future can approach it more easily. |
Three improvements:
MaterializedClasspathtoToolClasspath. The type is only being used to set up tools—whether those be external like Scalafmt or internal like our JVM parser. This rename makes that clear, which will allow us to start adding tool-specific functionality.ToolClasspathRequestis 1-per-tool. This is how we've been using it de facto, including in two rules where there are 2 tools used in the same process. This allows us to simplify callsites / remove verbosity.open(). This is necessary to not break caching.Tool lockfiles still have issues - a followup will fix these:
scalac_plugins.pyis not using lockfile validation