[internal] Simplify import resolvers #1746
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
ericvergnaud
had a problem deploying
to
account-admin
GitHub Actions
Failure
11 tasks
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #1746 +/- ##
==========================================
- Coverage 89.66% 89.64% -0.02%
==========================================
Files 93 93
Lines 11405 11377 -28
Branches 2005 2005
==========================================
- Hits 10226 10199 -27
+ Misses 794 793 -1
Partials 385 385 ☔ View full report in Codecov by Sentry. |
nfx
requested changes
May 22, 2024
| @@ -277,21 +277,9 @@ def _fail(code: str, message: str) -> MaybeDependency: | |||
|
|
|||
| class BaseImportResolver(abc.ABC): | |||
There was a problem hiding this comment.
redundant: we no longer need BaseImportResolver
There was a problem hiding this comment.
it's necessary to avoid circular imports (same as BaseNotebookResolver)
| @@ -111,13 +112,11 @@ def __repr__(self): | |||
|
|
|||
| class LocalFileResolver(BaseImportResolver, BaseFileResolver): | |||
There was a problem hiding this comment.
Suggested change
| class LocalFileResolver(BaseImportResolver, BaseFileResolver): | |
| class ImportResolver(BaseFileResolver): |
and get rid of BaseImportResolver.
There was a problem hiding this comment.
renamed to ImportFileResolver
| return WhitelistResolver(self._whitelist, resolver) | ||
|
|
||
| def resolve_import(self, path_lookup: PathLookup, name: str) -> MaybeDependency: | ||
| def resolve_import(self, name: str) -> MaybeDependency | None: | ||
| # TODO attach compatibility to dependency, see https://github.com/databrickslabs/ucx/issues/1382 | ||
| compatibility = self._whitelist.compatibility(name) |
There was a problem hiding this comment.
move the body of this method as private method to ImportResolver class and get rid of WhitelistResolver.
added 2 commits
May 23, 2024 09:38
ericvergnaud
had a problem deploying
to
account-admin
GitHub Actions
Error
ericvergnaud
had a problem deploying
to
account-admin
GitHub Actions
Failure
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.
Changes
Remove chain of import resolvers in favor of a single resolver.
Supersedes #1709
Resolves #1707