diff options
| author | Matt Clay <matt@mystile.com> | 2023-03-06 16:00:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-06 16:00:59 -0800 |
| commit | 2154de5eb5bd6af0076e0e68633a0cf3e1625d1e (patch) | |
| tree | ba916e475d0e426e77aa455b502a01152959c7e3 | |
| parent | 42e93c1c4f755d771e025de2729a0a3c2cdd2e4b (diff) | |
| download | ansible-2154de5eb5bd6af0076e0e68633a0cf3e1625d1e.tar.gz | |
[stable-2.12] Fix MANIFEST.in includes (#80147) (#80150)
* [stable-2.12] Fix MANIFEST.in includes (#80147).
(cherry picked from commit 7c62cdeecd4834a1ca38a01e42ea07e33044de19)
* Include additional packaging files
| -rw-r--r-- | MANIFEST.in | 8 | ||||
| -rw-r--r-- | changelogs/fragments/fix-manifest.yml | 3 | ||||
| -rw-r--r-- | test/sanity/code-smell/package-data.py | 1 |
3 files changed, 9 insertions, 3 deletions
diff --git a/MANIFEST.in b/MANIFEST.in index b87e4c388b..9b7fe686bd 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -21,7 +21,11 @@ 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 packaging/arch * +recursive-include packaging/debian * +recursive-include packaging/gentoo * +recursive-include packaging/macports * recursive-include test/ansible_test *.py Makefile recursive-include test/integration * recursive-include test/lib/ansible_test/config *.yml *.template @@ -29,7 +33,7 @@ recursive-include test/lib/ansible_test/_data *.cfg *.ini *.ps1 *.txt *.yml cove recursive-include test/lib/ansible_test/_util *.cfg *.json *.ps1 *.psd1 *.py *.sh *.txt *.yml recursive-include test/lib/ansible_test/_util/controller/sanity/validate-modules validate-modules recursive-include test/sanity *.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.* recursive-include test/units * include Makefile 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 81f0c3087c..b4e4172937 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/return_skeleton_generator.py', 'hacking/test-module', 'hacking/test-module.py', - 'test/support/README.md', '.cherry_picker.toml', '.mailmap', # Generated as part of a build step |