summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2023-03-06 15:59:05 -0800
committerGitHub <noreply@github.com>2023-03-06 15:59:05 -0800
commit74ea1b8f85c24f75d9d3d129eda829ade2bd296a (patch)
treed140ff7268723184968e44cd2d45c9a2ed950354
parent6cffa10de008d1243a4ee263c7e334a7f42ff137 (diff)
downloadansible-74ea1b8f85c24f75d9d3d129eda829ade2bd296a.tar.gz
[stable-2.13] Fix MANIFEST.in includes (#80147) (#80149)
(cherry picked from commit 7c62cdeecd4834a1ca38a01e42ea07e33044de19)
-rw-r--r--MANIFEST.in4
-rw-r--r--changelogs/fragments/fix-manifest.yml3
-rw-r--r--test/sanity/code-smell/package-data.py1
3 files changed, 5 insertions, 3 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index e56b10235e..c048e64832 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -26,7 +26,7 @@ recursive-include lib/ansible/modules/windows *.ps1
recursive-include lib/ansible/galaxy/data *.yml *.j2 README.md ansible.cfg inventory .git_keep
recursive-include lib/ansible/config *.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
@@ -34,7 +34,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 5497b7cae8..4b8f2e21e5 100644
--- a/test/sanity/code-smell/package-data.py
+++ b/test/sanity/code-smell/package-data.py
@@ -53,7 +53,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',