From 7c62cdeecd4834a1ca38a01e42ea07e33044de19 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Mon, 6 Mar 2023 15:28:53 -0800 Subject: [PATCH] Fix MANIFEST.in includes (#80147) --- MANIFEST.in | 4 ++-- changelogs/fragments/fix-manifest.yml | 3 +++ test/sanity/code-smell/package-data.py | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 changelogs/fragments/fix-manifest.yml diff --git a/MANIFEST.in b/MANIFEST.in index 9495469bd26..6c8673650bc 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 00000000000..b8e1795a43c --- /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 38509f1da63..fc894a776b1 100644 --- a/test/sanity/code-smell/package-data.py +++ b/test/sanity/code-smell/package-data.py @@ -51,7 +51,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',