Merge pull request #3362 from ThomasWaldmann/package-data-1.1

clean up and simplify packaging (1.1-maint)

MANIFEST.in

@@ -1,8 +1,6 @@
-include README.rst AUTHORS LICENSE CHANGES.rst MANIFEST.in
-exclude .coafile .coveragerc .gitattributes .gitignore .travis.yml Vagrantfile
+# stuff we need to include into the sdist is handled automatically by
+# setuptools_scm - it includes all git-committed files.
+# but we want to exclude some committed files/dirs not needed in the sdist:
+exclude .coafile .coveragerc .editorconfig .gitattributes .gitignore .mailmap .travis.yml Vagrantfile
 prune .travis
 prune .github
-graft src
-graft docs
-prune docs/_build
-global-exclude *.py[co] *.orig *.so *.dll

setup.py

@@ -807,10 +807,12 @@ def run(self):
             'borgfs = borg.archiver:main',
         ]
     },
+    # See also the MANIFEST.in file.
+    # We want to install all the files in the package directories...
     include_package_data=True,
-    package_data={
-        'borg': ['paperkey.html'],
-        'borg.testsuite': ['attic.tar.gz'],
+    # ...except the source files which have been compiled (C extensions):
+    exclude_package_data={
+        '': ['*.c', '*.h', '*.pyx', ],
     },
     cmdclass=cmdclass,
     ext_modules=ext_modules,