Merge 746f976 into a844c0f

decalage2 · Dec 10, 2017 · 09ac7c6 · 09ac7c6
2 parents a844c0f + 746f976
commit 09ac7c6
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 19 deletions.
diff --git a/olefile/CONTRIBUTORS.txt → CONTRIBUTORS.txt b/olefile/CONTRIBUTORS.txt → CONTRIBUTORS.txt
diff --git a/olefile/LICENSE.txt → LICENSE.txt b/olefile/LICENSE.txt → LICENSE.txt
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,6 +1,9 @@
+include CONTRIBUTORS.txt
 include install.bat
 include LICENSE.txt
+include README.html
 include README.md
+include README.rst
 include setup.py
 
 graft doc

diff --git a/olefile/README.html → README.html b/olefile/README.html → README.html
diff --git a/olefile/README.rst → README.rst b/olefile/README.rst → README.rst
diff --git a/setup.cfg b/setup.cfg
@@ -1,2 +1,5 @@
 [bdist_wheel]
 universal = 1
+
+[metadata]
+license_file = LICENSE.txt
diff --git a/setup.py b/setup.py
@@ -26,7 +26,7 @@
 version      = __version__
 desc         = "Python package to parse, read and write Microsoft OLE2 files (Structured Storage or Compound Document, Microsoft Office) - Improved version of the OleFileIO module from PIL, the Python Image Library."
 # read long description from disk in restructuredtext format:
-long_desc    = open('olefile/README.rst').read()
+long_desc    = open('README.rst').read()
 author       = __author__
 author_email = "https://www.decalage.info/contact"
 url          = "https://www.decalage.info/python/olefileio"
@@ -123,23 +123,6 @@ def rglob(top, prefix='', pattern='*'):
     return list(riglob(top, prefix, pattern))
 
 
-
-
-package_data={
-    'olefile': [
-        'README.rst',
-        'README.html',
-        'LICENSE.txt',
-        'CONTRIBUTORS.txt',
-        # 'olefile.html',
-        ]
-        # doc folder: md, html, png
-        # + rglob('olefile/doc', 'doc', '*.html')
-        # + rglob('olefile/doc', 'doc', '*.md')
-        # + rglob('olefile/doc', 'doc', '*.png'),
-    }
-
-
 #--- data files ---------------------------------------------------------------
 
 # not used for now.
@@ -239,7 +222,6 @@ def main():
         license=license,
 ##        package_dir=package_dir,
         packages=packages,
-        package_data = package_data,
         py_modules = modules,
         download_url=download_url,
 #        data_files=data_files,