diff options
| author | Matt Clay <matt@mystile.com> | 2023-03-06 15:59:02 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-06 15:59:02 -0800 |
| commit | d8d2005096f32ea114f711dff2f363a1d27a705c (patch) | |
| tree | 4e269f480557cbf64d0f90e5f51e1d11023c8bf3 | |
| parent | 162345a77a4f5c28842ba76ccc2854edc2f025c8 (diff) | |
| download | ansible-d8d2005096f32ea114f711dff2f363a1d27a705c.tar.gz | |
[stable-2.14] Fix MANIFEST.in includes (#80147) (#80148)
(cherry picked from commit 7c62cdeecd4834a1ca38a01e42ea07e33044de19)
| -rw-r--r-- | MANIFEST.in | 4 | ||||
| -rw-r--r-- | changelogs/fragments/fix-manifest.yml | 3 | ||||
| -rw-r--r-- | test/sanity/code-smell/package-data.py | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/MANIFEST.in b/MANIFEST.in index 9495469bd2..6c8673650b 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -29,7 +29,7 @@ recursive-include lib/ansible/modules *.yml recursive-include lib/ansible/plugins/test *.yml recursive-include lib/ansible/plugins/filter *.yml recursive-include licenses *.txt -recursive-include packaging * +recursive-include packaging Makefile *.py recursive-include test/ansible_test *.py Makefile recursive-include test/integration * recursive-include test/lib/ansible_test/config *.yml *.template @@ -37,7 +37,7 @@ recursive-include test/lib/ansible_test/_data *.cfg *.in *.ini *.ps1 *.txt *.yml recursive-include test/lib/ansible_test/_util *.cfg *.ini *.json *.ps1 *.psd1 *.py *.sh *.txt *.yml recursive-include test/lib/ansible_test/_util/controller/sanity/validate-modules validate-modules recursive-include test/sanity *.in *.json *.py *.txt -recursive-include test/support *.py *.ps1 *.psm1 *.cs +recursive-include test/support *.py *.ps1 *.psm1 *.cs *.md exclude test/sanity/code-smell/botmeta.* exclude test/sanity/code-smell/release-names.* exclude test/lib/ansible_test/_internal/commands/sanity/bin_symlinks.py diff --git a/changelogs/fragments/fix-manifest.yml b/changelogs/fragments/fix-manifest.yml new file mode 100644 index 0000000000..b8e1795a43 --- /dev/null +++ b/changelogs/fragments/fix-manifest.yml @@ -0,0 +1,3 @@ +bugfixes: + - Fix ``MANIFEST.in`` to exclude unwanted files in the ``packaging/`` directory. + - Fix ``MANIFEST.in`` to include ``*.md`` files in the ``test/support/`` directory. diff --git a/test/sanity/code-smell/package-data.py b/test/sanity/code-smell/package-data.py index 0c6e76134e..34617c3946 100644 --- a/test/sanity/code-smell/package-data.py +++ b/test/sanity/code-smell/package-data.py @@ -54,7 +54,6 @@ def assemble_files_to_ship(complete_file_list): 'hacking/report.py', 'hacking/return_skeleton_generator.py', 'hacking/test-module', - 'test/support/README.md', 'test/lib/ansible_test/_internal/commands/sanity/bin_symlinks.py', 'test/lib/ansible_test/_internal/commands/sanity/integration_aliases.py', '.cherry_picker.toml', |