From 206896e9b220a8999e050c5bf3e0f68f81119e04 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Wed, 25 Mar 2020 19:10:27 -0700 Subject: [PATCH] Cleanup refs to deleted files/dirs. (#68480) * Remove deleted contrib dir from MANIFEST.in * Update package-data sanity test. Remove deleted files and directories. * Remove aws_config dirs. --- MANIFEST.in | 2 -- test/sanity/code-smell/package-data.py | 7 ------- 2 files changed, 9 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 3a7b92c6d2c..cae39e21d78 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -32,7 +32,5 @@ recursive-include test/units * include Makefile include MANIFEST.in include changelogs/CHANGELOG*.rst -include contrib/README.md -recursive-include contrib/inventory *.py *.ini *.yml *.yaml recursive-include hacking/build_library *.py include hacking/build-ansible.py diff --git a/test/sanity/code-smell/package-data.py b/test/sanity/code-smell/package-data.py index 18de0760438..c408ecb64d8 100755 --- a/test/sanity/code-smell/package-data.py +++ b/test/sanity/code-smell/package-data.py @@ -24,8 +24,6 @@ def assemble_files_to_ship(complete_file_list): '.github/*', '.github/*/*', 'changelogs/fragments/*', - 'hacking/aws_config/*', - 'hacking/aws_config/*/*', 'hacking/shippable/*', 'hacking/tests/*', 'hacking/ticket_stubs/*', @@ -35,10 +33,6 @@ def assemble_files_to_ship(complete_file_list): 'test/utils/*/*', 'test/utils/*/*/*', '.git*', - # Consciously left out - 'examples/playbooks/*', - # Possibly should be included - 'contrib/vault/*', ) ignore_files = frozenset(( # Developer-only tools @@ -70,7 +64,6 @@ def assemble_files_to_ship(complete_file_list): 'hacking/env-setup.fish', 'CODING_GUIDELINES.md', 'MANIFEST', - 'MODULE_GUIDELINES.md', )) # These files are generated and then intentionally added to the sdist