From bac6fe7e608b185413c0e8cfa5c38576e5af08d1 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Wed, 23 Jul 2014 09:51:24 +0800 Subject: [PATCH] Removing extra files from package After trying hard to add the extra files in a standard location I am giving up. It seems pretty difficult to predict where the files will end up on different systems, especially due to the inconsistencies between an installation using setup.py vs. pip. --- MANIFEST.in | 1 - setup.py | 13 ++----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index d0bb4b0..87647da 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,4 +2,3 @@ include *.txt include *.md include mdk/config-dist.json include mdk/scripts/* -include extra/* \ No newline at end of file diff --git a/setup.py b/setup.py index 9279ca8..3fdf245 100644 --- a/setup.py +++ b/setup.py @@ -43,12 +43,7 @@ scripts = [] for f in os.listdir(os.path.join(os.path.dirname(__file__), 'mdk', 'scripts')): if f == 'README.rst': continue - scripts.append('mdk/scripts/%s' % (f)) - -# Get the content of the extra folder. -tools = [] -for f in os.listdir(os.path.join(os.path.dirname(__file__), 'extra')): - tools.append('extra/%s' % (f)) + scripts.append('scripts/%s' % (f)) setup( name='moodle-sdk', @@ -75,12 +70,8 @@ setup( keywords='mdk moodle moodle-sdk', packages=find_packages(), - package_data={'mdk': ['config-dist.json']}, + package_data={'mdk': ['config-dist.json'] + scripts}, install_requires=requirements, - data_files=[ - ('scripts', scripts), - ('tools', tools) - ], include_package_data=True, entry_points={ -- 2.11.0