Improve cache reuse for ./pants package when using a constraints file or lockfile
#12807
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…le or lockfile # 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]
|
cc @asherf - this should help fix your find that |
|
This seems fine... I'm a little unclear on how this interplays with multiple-user resolves. It seems like "lockfile args" are basically "args to be used in the identity of a resolve", and would be best specified via named resolve config? Either way: will wait for #12808 to land to review. |
Ah, good insight! Yes, I do think these args need to be included in the resolve metadata somehow, but we can probably punt for now given that lockfile is being put on pause. This at least gets us closer to the solution. cc @chrisjrn |
stuhood
approved these changes
Sep 9, 2021
# Conflicts: # src/python/pants/backend/python/util_rules/pex_from_targets.py # 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]
stuhood
approved these changes
Sep 9, 2021
| @@ -104,6 +106,10 @@ def __init__( | |||
| interpreter constraints to not be used because platforms already constrain the valid | |||
| Python versions, e.g. by including `cp36m` in the platform string. | |||
| :param additional_args: Any additional Pex flags. | |||
| :param additional_args: Any additional Pex flags that should be used with the lockfile.pex. | |||
There was a problem hiding this comment.
Suggested change
| :param additional_args: Any additional Pex flags that should be used with the lockfile.pex. | |
| :param additional_lockfile_args: Any additional Pex flags that should be used with the lockfile.pex. |
There was a problem hiding this comment.
Oops, missed by 43 seconds! Will fix in a related followup.
Eric-Arellano
added a commit
to Eric-Arellano/pants
that referenced
this pull request
Sep 9, 2021
…le or lockfile (pantsbuild#12807) Improves upon the solution from pantsbuild#12076. There are some args like `--manylinux` that we need to use both with the lockfile.pex and the final `PexFromTargets`. But many others like `--strip-pex-env` are irrelevant for the lockfile.pex, and we only need to set on the final PEX. WIth this diff: ```diff diff --git a/build-support/bin/BUILD b/build-support/bin/BUILD index d9751179b..2a6e76478 100644 --- a/build-support/bin/BUILD +++ b/build-support/bin/BUILD @@ -17,4 +17,4 @@ pex_binary(name="generate_docs", entry_point="generate_docs.py", dependencies=[" pex_binary(name="generate_github_workflows", entry_point="generate_github_workflows.py") pex_binary(name="generate_user_list", entry_point="generate_user_list.py", dependencies=[":user_list_templates"]) pex_binary(name="release_helper", entry_point="_release_helper.py") -pex_binary(name="reversion", entry_point="reversion.py") +pex_binary(name="reversion", entry_point="reversion.py", always_write_cache=True) ``` Before: ``` ❯ ./pants --no-process-execution-local-cache --no-remote-cache-read --no-pantsd package build-support/bin: ... 23:50:18.32 [INFO] Completed: Installing 3rdparty/python/lockfiles/user_reqs.txt 23:50:18.32 [INFO] Completed: Installing 3rdparty/python/lockfiles/user_reqs.txt ``` After: ``` ❯ ./pants --no-process-execution-local-cache --no-remote-cache-read --no-pantsd package build-support/bin: ... 23:49:14.07 [INFO] Completed: Installing 3rdparty/python/lockfiles/user_reqs.txt ... ``` [ci skip-rust] [ci skip-build-wheels]
jsirois
added a commit
to jsirois/pants
that referenced
this pull request
Sep 10, 2021
…uild#12778)) * Add python-docx to the module mapping dictionary ([pantsbuild#12775](pantsbuild#12775)) * Add python-pptx to the module mapping dictionary ([pantsbuild#12776](pantsbuild#12776)) * Add `opencv-python` to the default Python module mapping ([pantsbuild#12777](pantsbuild#12777)) * Add `PyMuPDF` to the default Python module mapping ([pantsbuild#12774](pantsbuild#12774)) * Deprecate `--list-provides` option. ([pantsbuild#12759](pantsbuild#12759)) * Upgrade default `isort` to latest `isort==5.9.3` ([pantsbuild#12756](pantsbuild#12756)) * `OutputPathField.value_or_default()` no longer has an `Address` argument ([pantsbuild#12837](pantsbuild#12837)) * Properly include file dependencies in docker build context ([pantsbuild#12758](pantsbuild#12758)) * DigestSubset should not short-circuit when there are ignores involved. ([pantsbuild#12648](pantsbuild#12648)) * Improve cache reuse for `./pants package` when using a constraints file or lockfile ([pantsbuild#12807](pantsbuild#12807)) * Upgrade to Pex 2.1.48 and leverage packed layout. ([pantsbuild#12808](pantsbuild#12808)) * Fix backports of std lib modules like `dataclasses` not working with dependency inference ([pantsbuild#12818](pantsbuild#12818)) * Warn if `[python-repos]` is set during lockfile generation ([pantsbuild#12800](pantsbuild#12800)) * Add `version` to lockfile metadata headers ([pantsbuild#12788](pantsbuild#12788)) * jvm: add missing space to avoid two words running together ([pantsbuild#12793](pantsbuild#12793)) * Fix a markdown issue in a help string. ([pantsbuild#12766](pantsbuild#12766)) [ci skip-rust]
Eric-Arellano
added a commit
that referenced
this pull request
Sep 10, 2021
…le or lockfile (#12807) (#12836) Improves upon the solution from #12076. There are some args like `--manylinux` that we need to use both with the lockfile.pex and the final `PexFromTargets`. But many others like `--strip-pex-env` are irrelevant for the lockfile.pex, and we only need to set on the final PEX. WIth this diff: ```diff diff --git a/build-support/bin/BUILD b/build-support/bin/BUILD index d9751179b..2a6e76478 100644 --- a/build-support/bin/BUILD +++ b/build-support/bin/BUILD @@ -17,4 +17,4 @@ pex_binary(name="generate_docs", entry_point="generate_docs.py", dependencies=[" pex_binary(name="generate_github_workflows", entry_point="generate_github_workflows.py") pex_binary(name="generate_user_list", entry_point="generate_user_list.py", dependencies=[":user_list_templates"]) pex_binary(name="release_helper", entry_point="_release_helper.py") -pex_binary(name="reversion", entry_point="reversion.py") +pex_binary(name="reversion", entry_point="reversion.py", always_write_cache=True) ``` Before: ``` ❯ ./pants --no-process-execution-local-cache --no-remote-cache-read --no-pantsd package build-support/bin: ... 23:50:18.32 [INFO] Completed: Installing 3rdparty/python/lockfiles/user_reqs.txt 23:50:18.32 [INFO] Completed: Installing 3rdparty/python/lockfiles/user_reqs.txt ``` After: ``` ❯ ./pants --no-process-execution-local-cache --no-remote-cache-read --no-pantsd package build-support/bin: ... 23:49:14.07 [INFO] Completed: Installing 3rdparty/python/lockfiles/user_reqs.txt ... ``` [ci skip-rust] [ci skip-build-wheels]
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Improves upon the solution from #12076. There are some args like
--manylinuxthat we need to use both with the lockfile.pex and the finalPexFromTargets. But many others like--strip-pex-envare irrelevant for the lockfile.pex, and we only need to set on the final PEX.WIth this diff:
Before:
After:
[ci skip-rust]
[ci skip-build-wheels]