[ty] Move search path resolution to Options::to_program_settings
#18937
Conversation
MichaReiser
changed the title
Options::to_program_settings"Options::to_program_settings
MichaReiser
added
internal
|
|
| if current_python_version != &python_version_from_environment | ||
| && current_python_version.source.priority() | ||
| <= python_version_from_environment.source.priority() |
There was a problem hiding this comment.
I'm not sure if there's a test demonstrating why this is needed. The Default, Config and Cli cases are inherent by how we resolve options. I would expect that the other cases work because we simply re-run the entire settings resolution (including the search path discovery) whenever the settings change and the priority should be encoded in the setting/search path resolution.
There was a problem hiding this comment.
I think I was possibly confused about when exactly the update_search_paths method is called.
Could it be called without re-resolving all other settings if e.g. a .pth file in the site-packages directory changes (which affects editable-installation search paths)? If so, it's possible that the update_search_paths method might accidentally override the Python version specified in a pyproject.toml file, even though the version in the pyproject.toml file should always take precedence over the Python version inferred from a virtual environment?
There was a problem hiding this comment.
It's only called when the VERSIONS file in the typeshed directory changed and we then resolve all settings the same as we would when the configuration changed.
* main: [ty] Add regression-benchmark for attribute-assignment hang (#18957) [ty] Format conflicting types as an enumeration (#18956) [ty] Prevent union builder construction for just one declaration (#18954) [ty] Infer nonlocal types as unions of all reachable bindings (#18750) [`pyflakes`] Mark `F504`/`F522`/`F523` autofix as unsafe if there's a call with side effect (#18839) [`playground`] Add ruff logo docs link to Header.tsx (#18947) [ty] Reduce the overwhelming complexity of `TypeInferenceBuilder::infer_call_expression` (#18943) [ty] Add subdiagnostic about empty bodies in more cases (#18942) [ty] Move search path resolution to `Options::to_program_settings` (#18937) [`flake8-errmsg`] Extend `EM101` to support byte strings (#18867) Move big rule implementations (#18931) [`pylint`] Allow fix with comments and document performance implications (`PLW3301`) (#18936)
Summary
This PR moves the
SearchPaths::from_settingscall and the resolution of the final Python version intoOptions::to_program_settings.We want to use
ProgramSettingsas a cache key for persistent caching (e.g., checking different Python versions should resolve in loading different persistent caches). For this to work well, it's important thatProgramSettingsmainly holds resolved settings. For example, it's essential that the following two runs in an activated virtual environment using Python 3.10 result in the same computed cache key:ty check --python-version 3.10andty check.The reason I made this change now is that I investigated what it would mean if the LSP passed the selected interpreter in the Python extension as a lowest-priority fallback value. We want to make sure that ty reuses the persistent cache between a
ty check --python-version 3.10run and when the interpreter selected in the IDE uses Python 3.10.This should hopefully also simplify the handling of
VIRTUAL_ENVandCONDA_ENVas fallback if no python version is provided.Test Plan
Existing tests. I did move some tests from
ProjectMetadatato CLI tests because keeping them in the metadata tests would have required increasing the visibility of many fields.