Repository navigation
[packaging] Include monitoring data files in distributions - #1868
Vamsi-2581 wants to merge 2 commits into
Conversation
|
|
I think an outsider contribution minutes after filing an Issue is probably a record -- thanks! Let us know if you have any trouble with the Linux Foundation CLA. It's supposed to be easy to sign, but sometimes isn't. |
| @@ -1,2 +1,3 @@ | |||
| include monitoring/_version.py | |||
| recursive-include scripts/git *.py | |||
| recursive-include monitoring * | |||
There was a problem hiding this comment.
I have the feeling this is too wide, and that we wanted "targeted" includes.
The official publish via CI is done from a fresh clone, so it's mostly fine, but locally this would include:
- Personal configurations
output/folders.pyccache files
(And on a fresh build, this would ship unnecessary files like Dockerfiles, Makefiles, scripts, etc.)
This could also be fixed with excludes (e.g. global-exclude *.py[cod] .gitignore, prune monitoring/uss_qualifier/output).
There was a problem hiding this comment.
The list I was going to propose would have been:
include monitoring/monitorlib/assets/WW15MGH.DAC
recursive-include monitoring/monitorlib/html/templates *.html *.js
recursive-include monitoring/mock_uss/templates *.html
recursive-include monitoring/prober/scd/resources *.json *.yaml
recursive-include monitoring/uss_qualifier/reports/templates *.html *.template
recursive-include monitoring/uss_qualifier/requirements *.md
recursive-include monitoring/uss_qualifier/scenarios *.md
recursive-include monitoring/uss_qualifier/suites *.yaml
|
I just wanted to check up on this PR; I think it is valuable and so I'd like to make sure the appropriate adjustments are made. Do you think you'll be able to sign the CLA and make the adjustments suggested above? Otherwise, I can propose an alternate PR. |
|
I replaced the broad recursive include with the targeted resource list you proposed in commit 67aa875. I have not built or inspected the package locally, and the hosted workflows are awaiting maintainer approval. The EasyCLA signature is still pending and must be completed by the account holder personally. |
Fixes #1867.
Before this change,
MANIFEST.inincluded every file undermonitoring/. This could package personal configuration, generated output, cache files, and unrelated build files.This change adds the targeted resource and documentation patterns proposed in review while preserving the version file and Git helper scripts.
Validation