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

chore: only copy non-test headers #2893

Merged
merged 1 commit into from
Dec 12, 2023

Conversation

agoose77
Copy link
Collaborator

Whilst checking our wheel to ensure that the necessary headers are included (c.f. #2892), I noticed that an extra header file has snuck into the archive.

This PR ensures we only flatten the header-only/*/awkward/* heirarchy.

Copy link

codecov bot commented Dec 12, 2023

Codecov Report

Merging #2893 (da5cfef) into main (e2510ca) will decrease coverage by 0.01%.
Report is 3 commits behind head on main.
The diff coverage is 81.81%.

Additional details and impacted files
Files Coverage Δ
src/awkward/_nplikes/cupy.py 37.77% <100.00%> (ø)
src/awkward/_nplikes/jax.py 82.60% <100.00%> (ø)
src/awkward/_nplikes/numpy.py 92.10% <100.00%> (ø)
src/awkward/_nplikes/typetracer.py 74.67% <100.00%> (ø)
src/awkward/_parameters.py 82.22% <100.00%> (ø)
src/awkward/_singleton.py 89.65% <100.00%> (ø)
src/awkward/_typing.py 92.85% <100.00%> (ø)
src/awkward/operations/ak_concatenate.py 85.14% <100.00%> (ø)
src/awkward/operations/ak_from_json.py 93.57% <100.00%> (ø)
src/awkward/_connect/pyarrow.py 90.57% <66.66%> (-0.58%) ⬇️

Copy link
Member

@jpivarski jpivarski left a comment

Choose a reason for hiding this comment

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

If it was flattening the hierarchy of all *.h files, I don't see how awkward-cpp would have been compiling. The #include statements use relative subdirectories. For example,

#include "awkward/builder/ArrayBuilder.h"
#include "awkward/common.h"
#include "awkward/io/json.h"

Or was this just an issue in the header files included in the sdist?

Anyway, it's a good thing to fix; please do merge.

@agoose77
Copy link
Collaborator Author

@jpivarski these are headers in the header-only part of awkward rather than awkward-cpp. For our header-only files, each component lives under awkward/XXX.h, so foo/awkward/FOO.h and bar/awkward/BAR.h can be flattened under the same awkward/ prefix

@agoose77 agoose77 merged commit e995bb1 into main Dec 12, 2023
38 checks passed
@agoose77 agoose77 deleted the agoose77/chore-only-copy-proper-headers branch December 12, 2023 17:08
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.

2 participants