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

Ensure that ancestor files at the buildroot are found. #11632

Merged
merged 1 commit into from Mar 4, 2021

Conversation

benjyw
Copy link
Sponsor Contributor

@benjyw benjyw commented Mar 4, 2021

Previously we would find ancestor files correctly all the
way to the source root, and even above, but would stop short
at the buildroot.

However there are real-world cases in which the buildroot is
the source root, and can contain, e.g., conftest.py files which
we fail to discover.

This change fixes this oversight.

[ci skip-rust]

[ci skip-build-wheels]

Previously we would find ancestor files correctly all the
way to the source root, and even above, but would stop short
at the buildroot.

However there are real-world cases in which the buildroot is
the source root, and can contain, e.g., conftest.py files which
we fail to discover.

This change fixes this oversight.

[ci skip-rust]

[ci skip-build-wheels]
@stuhood stuhood added this to the 2.3.x milestone Mar 4, 2021
@benjyw
Copy link
Sponsor Contributor Author

benjyw commented Mar 4, 2021

Merging based on the green Travis build, the test failure on GHA is a flake that we should investigate separately.

@benjyw benjyw merged commit 8a94bb4 into pantsbuild:master Mar 4, 2021
@benjyw benjyw deleted the fix_ancestor_files branch March 4, 2021 17:40
benjyw added a commit to benjyw/pants that referenced this pull request Mar 4, 2021
)

Previously we would find ancestor files correctly all the
way to the source root, and even above, but would stop short
at the buildroot.

However there are real-world cases in which the buildroot is
the source root, and can contain, e.g., conftest.py files which
we fail to discover.

This change fixes this oversight.

[ci skip-rust]

[ci skip-build-wheels]
benjyw added a commit that referenced this pull request Mar 4, 2021
* Two enhancements to tailor. (#11625)

1. We require root-level targets to be
   explicitly named, so this change makes tailor
   take care of that.

2. It's possible for directory named BUILD to collide
   with a file we want to create under the same name.
   This is not as unlikely as you may think on systems
   where paths are case-insensitive, such as MacOS.
   This change detects this case and renames the BUILD
   file.

* Ensure that ancestor files at the buildroot are found. (#11632)

Previously we would find ancestor files correctly all the
way to the source root, and even above, but would stop short
at the buildroot.

However there are real-world cases in which the buildroot is
the source root, and can contain, e.g., conftest.py files which
we fail to discover.

This change fixes this oversight.

[ci skip-rust]

[ci skip-build-wheels]
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

2 participants