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.

diff --git a/MANIFEST.in b/MANIFEST.in
index d0bb4b0..87647da 100644 (file)
--- 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 (file)
--- 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={