From 7fb287a5b61dbe8191118731e934e6a7b6705367 Mon Sep 17 00:00:00 2001 From: kyleknap Date: Wed, 24 Aug 2022 16:36:19 -0700 Subject: [PATCH] Use include_package_data instead of package_data This allows us to specify the package data once in the Manifest.in file. Specifcally, the include_package_data will include files listed as part of the Manifest.in as part of the package if they reside in the packages directory. This will also help us avoid issues where some package files are included in the sdist and not the wheel because the package_data differs from what is declared in the Manifest.in --- MANIFEST.in | 1 + setup.py | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 8fa4da82f6dc..7295cf117791 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,3 +4,4 @@ include requirements.txt include UPGRADE_PY3.md recursive-include awscli/examples *.rst *.txt recursive-include awscli/data *.json +recursive-include awscli/topics *.rst *.json diff --git a/setup.py b/setup.py index 137d3a642b3e..8317c698f76f 100644 --- a/setup.py +++ b/setup.py @@ -44,10 +44,7 @@ def find_version(*file_paths): 'bin/aws_completer', 'bin/aws_zsh_completer.sh', 'bin/aws_bash_completer'], packages=find_packages(exclude=['tests*']), - package_data={'awscli': ['data/*.json', 'examples/*.rst', - 'examples/*/*.rst', 'examples/*/*.txt', - 'examples/*/*/*.txt', 'examples/*/*/*.rst', - 'topics/*.rst', 'topics/*.json']}, + include_package_data=True, install_requires=install_requires, extras_require={}, license="Apache License 2.0",