Remove direct pex imports from the codebase #21515
Open
+45
−15
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
krishnan-chandra
added
category:bugfix
Comment on lines
+228
to
+261
| # This method is copied from the pex package, located at pex.variables.Variables._get_kv(). | ||
| # It is copied here to avoid a hard dependency on pex. | ||
| def _get_kv(variable: str) -> Optional[list[str]]: | ||
| kv = variable.strip().split("=") | ||
| if len(list(filter(None, kv))) == 2: | ||
| return kv | ||
| else: | ||
| return None | ||
|
|
||
|
|
||
| # This method is copied from the pex package, located at pex.variables.Variables.from_rc(). | ||
| # It is copied here to avoid a hard dependency on pex. | ||
| def _read_pex_rc(rc: Optional[str] = None) -> dict[str, str]: | ||
| """Read pex runtime configuration variables from a pexrc file. | ||
|
|
||
| :param rc: an absolute path to a pexrc file. | ||
| :return: A dict of key value pairs found in processed pexrc files. | ||
| """ | ||
| ret_vars = {} | ||
| rc_locations = [ | ||
| os.path.join(os.sep, "etc", "pexrc"), | ||
| os.path.join("~", ".pexrc"), | ||
| os.path.join(os.path.dirname(sys.argv[0]), ".pexrc"), | ||
| ] | ||
| if rc: | ||
| rc_locations.append(rc) | ||
| for filename in rc_locations: | ||
| try: | ||
| with open(os.path.expanduser(filename)) as fh: | ||
| rc_items = map(_get_kv, fh) | ||
| ret_vars.update(dict(filter(None, rc_items))) | ||
| except OSError: | ||
| continue | ||
| return ret_vars |
There was a problem hiding this comment.
This involves reading the pexrc file, which kind of explains why we were directly importing from pex before. I'm not sure if it's worth keeping a hard dependency just for this, but maybe it is in case that logic changes in the future.
| @@ -143,7 +141,7 @@ def provide_chroot(existing): | |||
|
|
|||
| # Default to resolving with whatever we're currently running with. | |||
| interpreter_constraints = ( | |||
| InterpreterConstraints([f"=={interpreter.identity.version_str}"]) if interpreter else None | |||
| InterpreterConstraints([f"=={python_version}.*"]) if python_version else None | |||
There was a problem hiding this comment.
Note - this does subtly change because we are no longer using Pex to hard-pin the patch version of Python in this constraint; we only pin the minor version. That could potentially be a problem if this behavior is particularly material to the test.
krishnan-chandra
force-pushed
the
excise-direct-pex-imports
branch
from
d273ce6
to
5b5b8b7
Compare
krishnan-chandra
added
category:internal
|
Fixed the failing test - we can't remove |
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.
Closes #21401. This removes any direct imports of
pexin the codebase but retains it as a dependency, because certain tests depend on it.