From dfc57e7049ab689f1048d0de29d73fdda31cdeb5 Mon Sep 17 00:00:00 2001 From: James Saryerwinnie Date: Mon, 19 Aug 2013 12:58:20 -0700 Subject: [PATCH] Grab examples from the awscli/examples Use package_data the same way we're using it for the .json files. Also examples/*/* is how we specify the files. This will need to change if we have directory structures that nest more deeply than this. --- MANIFEST.in | 2 +- setup.py | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 5f9225daaa43..d5466ce03b74 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,5 @@ include README.rst include LICENSE.txt include requirements.txt -recursive-include doc/source/examples *.rst +recursive-include awscli/examples *.rst recursive-include awscli/data *.json diff --git a/setup.py b/setup.py index d131b42f0345..b6942a719038 100644 --- a/setup.py +++ b/setup.py @@ -10,18 +10,6 @@ from setuptools import setup, find_packages -def _get_example_files(): - filenames = [] - for root, dirs, files in os.walk('doc/source/examples'): - for filename in files: - filenames.append(os.path.join(root, filename)) - return filenames - - -def get_data_files(): - return [('awscli/examples', _get_example_files())] - - requires = ['botocore>=0.14.0,<0.15.0', 'bcdoc>=0.6.0,<0.7.0', 'six>=1.1.0', @@ -43,8 +31,7 @@ def get_data_files(): 'bin/aws_completer', 'bin/aws_zsh_completer.sh'], packages=find_packages('.', exclude=['tests*']), package_dir={'awscli': 'awscli'}, - package_data={'awscli': ['data/*.json']}, - data_files=get_data_files(), + package_data={'awscli': ['data/*.json', 'examples/*/*']}, install_requires=requires, license=open("LICENSE.txt").read(), classifiers=(