mirror of
https://github.com/zebrajr/ansible.git
synced 2025-12-06 00:19:48 +01:00
Clean up MANIFEST.in (#80688)
* Remove unnecessary MANIFEST.in commands This eliminates more setuptools warnings during build. * Sort MANIFEST.in Now that only include commands are used, the order of the commands no longer effects the build output.
This commit is contained in:
parent
08a647214f
commit
6e325d9e4d
39
MANIFEST.in
39
MANIFEST.in
|
|
@ -1,37 +1,20 @@
|
|||
include README.rst
|
||||
include COPYING
|
||||
include requirements.txt
|
||||
recursive-include docs *
|
||||
include docs/docsite/rst/collections/all_plugins.rst
|
||||
exclude docs/docsite/rst_warnings
|
||||
exclude docs/docsite/rst/conf.py
|
||||
exclude docs/docsite/rst/index.rst
|
||||
exclude docs/docsite/rst/dev_guide/index.rst
|
||||
exclude docs/docsite/rst/dev_guide/testing/sanity/bin-symlinks.rst
|
||||
exclude docs/docsite/rst/dev_guide/testing/sanity/botmeta.rst
|
||||
exclude docs/docsite/rst/dev_guide/testing/sanity/integration-aliases.rst
|
||||
exclude docs/docsite/rst/dev_guide/testing/sanity/release-names.rst
|
||||
recursive-exclude docs/docsite/_build *
|
||||
recursive-exclude docs/docsite/_extensions *.pyc *.pyo
|
||||
include examples/hosts
|
||||
include bin/*
|
||||
include changelogs/CHANGELOG*.rst
|
||||
include changelogs/changelog.yaml
|
||||
include examples/ansible.cfg
|
||||
include examples/hosts
|
||||
include examples/scripts/ConfigureRemotingForAnsible.ps1
|
||||
include examples/scripts/upgrade_to_ps3.ps1
|
||||
recursive-include licenses *.txt
|
||||
include hacking/build-ansible.py
|
||||
include hacking/test-module.py
|
||||
include hacking/update-sanity-requirements.py
|
||||
include licenses/*.txt
|
||||
include requirements.txt
|
||||
recursive-include docs *
|
||||
recursive-include hacking/build_library *.py
|
||||
recursive-include packaging *.py
|
||||
recursive-include test/integration *
|
||||
recursive-include test/sanity *.in *.json *.py *.txt
|
||||
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
|
||||
exclude test/lib/ansible_test/_internal/commands/sanity/integration_aliases.py
|
||||
recursive-include test/units *
|
||||
include MANIFEST.in
|
||||
include changelogs/CHANGELOG*.rst
|
||||
include changelogs/changelog.yaml
|
||||
recursive-include hacking/build_library *.py
|
||||
include hacking/build-ansible.py
|
||||
include hacking/test-module.py
|
||||
include hacking/update-sanity-requirements.py
|
||||
include bin/*
|
||||
|
|
|
|||
9
changelogs/fragments/manifest-in-cleanup.yml
Normal file
9
changelogs/fragments/manifest-in-cleanup.yml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
minor_changes:
|
||||
- Removed ``exclude`` and ``recursive-exclude`` commands for generated files from the ``MANIFEST.in`` file.
|
||||
These excludes were unnecessary since releases are expected to be built with a clean worktree.
|
||||
- Removed ``exclude`` commands for sanity test files from the ``MANIFEST.in`` file.
|
||||
These tests were previously excluded because they did not pass when run from an sdist.
|
||||
However, sanity tests are not expected to pass from an sdist, so excluding some (but not all) of the failing tests makes little sense.
|
||||
- Removed redundant ``include`` commands from the ``MANIFEST.in`` file.
|
||||
These includes either duplicated default behavior or another command.
|
||||
- Use ``include`` where ``recursive-include`` is unnecessary in the ``MANIFEST.in`` file.
|
||||
|
|
@ -32,8 +32,6 @@ def assemble_files_to_ship(complete_file_list):
|
|||
'hacking/azp/*',
|
||||
'hacking/tests/*',
|
||||
'hacking/ticket_stubs/*',
|
||||
'test/sanity/code-smell/botmeta.*',
|
||||
'test/sanity/code-smell/release-names.*',
|
||||
'test/results/.tmp/*',
|
||||
'test/results/.tmp/*/*',
|
||||
'test/results/.tmp/*/*/*',
|
||||
|
|
@ -56,8 +54,6 @@ def assemble_files_to_ship(complete_file_list):
|
|||
'hacking/report.py',
|
||||
'hacking/return_skeleton_generator.py',
|
||||
'hacking/test-module',
|
||||
'test/lib/ansible_test/_internal/commands/sanity/bin_symlinks.py',
|
||||
'test/lib/ansible_test/_internal/commands/sanity/integration_aliases.py',
|
||||
'.cherry_picker.toml',
|
||||
'.mailmap',
|
||||
# Generated as part of a build step
|
||||
|
|
@ -79,11 +75,6 @@ def assemble_files_to_ship(complete_file_list):
|
|||
'hacking/env-setup.fish',
|
||||
'MANIFEST',
|
||||
'setup.cfg',
|
||||
# docs for test files not included in sdist
|
||||
'docs/docsite/rst/dev_guide/testing/sanity/bin-symlinks.rst',
|
||||
'docs/docsite/rst/dev_guide/testing/sanity/botmeta.rst',
|
||||
'docs/docsite/rst/dev_guide/testing/sanity/integration-aliases.rst',
|
||||
'docs/docsite/rst/dev_guide/testing/sanity/release-names.rst',
|
||||
))
|
||||
|
||||
# These files are generated and then intentionally added to the sdist
|
||||
|
|
@ -117,8 +108,6 @@ def assemble_files_to_install(complete_file_list):
|
|||
"""
|
||||
ignore_patterns = (
|
||||
# Tests excluded from sdist
|
||||
'test/lib/ansible_test/_internal/commands/sanity/bin_symlinks.py',
|
||||
'test/lib/ansible_test/_internal/commands/sanity/integration_aliases.py',
|
||||
)
|
||||
|
||||
pkg_data_files = []
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user