Support multiple --pyenv options
#321
Merged
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
jherland
force-pushed
the
jherland/multiple-pyenvs-2
branch
from
654103d to
1b5204a
Compare
This was referenced May 6, 2023
jherland
force-pushed
the
jherland/multiple-pyenvs
branch
from
517775d to
a10e43a
Compare
|
🎉 All dependencies have been resolved ! |
jherland
force-pushed
the
jherland/multiple-pyenvs-2
branch
from
1b5204a to
5c10aa5
Compare
6 tasks
jherland
force-pushed
the
jherland/multiple-pyenvs-2
branch
from
5c10aa5 to
1c60455
Compare
Nour-Mws
reviewed
May 11, 2023
Nour-Mws
approved these changes
May 11, 2023
This adds the core logic for FawltyDeps to become able to handle multiple --pyenv arguments. Instead of taking an optional 'pyenv_path', we now take a 'pyenv_paths' set of paths; the new behavior is an extension of the old: - An empty set (corresponds to pyenv_path == None) implies that we use sys.path to look up packages. - A single-element set (corresponds to pyenv_path != None) will use the Python environment found at that path instead. - A multi-element set (new in this commit) causes packages to be looked up in _all_ the given Python environments. For packages that occur in more than one of these environments, the resulting Package object will _merge_ all the imports found among the various copies of this package (similar to how we deal with the same package occurring across multiple user-defined mappings).
jherland
force-pushed
the
jherland/multiple-pyenvs-2
branch
from
ed8b82a to
4f26b83
Compare
This makes the support for multiple Python environment that was added to LocalPackageResolver in the previous commit available to the rest of FawltyDeps: - resolve_dependencies() now takes a pyenv_paths set instead of the previous optional pyenv_path. - Settings now has a 'pyenvs: Set[Path]' member instead of the previous 'pyenv: Optional[Path]' member. - The CLI parser now accepts _multiple_ --pyenv argument values and collects them all into the 'pyenvs' set, similar to what we already do for --code and --deps. - A new paragraph in README.md explains that multiple --pyenv options are accepted, and how they are merged into one coherent package-to- import-names mapping. - The list of configuration directives updates the description for 'pyenv' into 'pyenvs' accordingly.
In our --json output, we customize pydantic's JSON encoder to represent sets as sorted lists (thus yielding stable output). Do the same for when we generate TOML config output (which goes via a JSON encoding step, and thus is subject to the same issue with how sets are encoded). This was discovered while attempting to test how multiple 'pyenvs' were represented in our TOML output.
jherland
force-pushed
the
jherland/multiple-pyenvs-2
branch
from
4f26b83 to
af07e8e
Compare
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.
These are the commits that were originally part of #313, but now split into this PR.
Commits:
LocalPackageResolver: Accept multiple pyenvs--pyenvoptionssettings.print_toml_config(): Represent sets as sorted lists