Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add logic from #1029 back with fix #1039

Merged
merged 4 commits into from
Feb 3, 2023
Merged

Conversation

f0rmiga
Copy link
Collaborator

@f0rmiga f0rmiga commented Feb 2, 2023

Since we had to revert #1029 due to a failure in resolving nested conftest files, this PR cherry-picks the merged commit, adds a test case to validate the expected behaviour, and adds the fix on top of it.

linzhp and others added 3 commits February 1, 2023 16:07
* Resolving sibling modules with absolute imports

* unconditionally importing conftest

* handle from statements

* adding tests

* adding readme for the new test case

Signed-off-by: Thulio Ferraz Assis <3149049+f0rmiga@users.noreply.github.com>
Signed-off-by: Thulio Ferraz Assis <3149049+f0rmiga@users.noreply.github.com>
Signed-off-by: Thulio Ferraz Assis <3149049+f0rmiga@users.noreply.github.com>
@f0rmiga
Copy link
Collaborator Author

f0rmiga commented Feb 2, 2023

cc @linzhp

Copy link
Contributor

@linzhp linzhp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing the bug. It's an interesting case that I wasn't aware of.

gazelle/python/generate.go Outdated Show resolved Hide resolved
@f0rmiga f0rmiga merged commit b832d50 into main Feb 3, 2023
@f0rmiga f0rmiga deleted the f0rmiga/add-pr-1029-back branch May 11, 2023 18:22
ianpegg-bc pushed a commit to ianpegg-bc/rules_python that referenced this pull request May 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants