Merge pull request #10 from jrconlin/bug/9

bug: Add missing MANIFEST file for pypi dist

Author: jrconlin

python/MANIFEST.in

@@ -0,0 +1,5 @@
+include *.md
+include *.txt
+include setup.*
+include LICENSE
+recursive-include py_vapid

python/setup.py

@@ -3,22 +3,26 @@
 
 from setuptools import setup, find_packages
 
-__version__ = "0.2"
+__version__ = "0.4.1"
+
+
+def read_from(file):
+    reply = []
+    with io.open(os.path.join(here, file), encoding='utf8') as f:
+        for l in f:
+            l = l.strip()
+            if not l:
+                break
+            if l[0] != '#' or l[:2] != '//':
+                reply.append(l)
+    return reply
+
 
 here = os.path.abspath(os.path.dirname(__file__))
 with io.open(os.path.join(here, 'README.md'), encoding='utf8') as f:
     README = f.read()
 with io.open(os.path.join(here, 'CHANGELOG.md'), encoding='utf8') as f:
     CHANGES = f.read()
-with io.open(os.path.join(here, 'requirements.txt'), encoding='utf8') as f:
-    REQS = []
-    for l in f:
-        l = l.strip()
-        if not l:
-            break
-        if l[0] == '#' or l[:2] == '//':
-            continue
-        REQS.append(l)
 
 setup(name="py-vapid",
       version=__version__,
@@ -29,17 +33,19 @@
                    "Programming Language :: Python :: 2",
                    "Programming Language :: Python :: 2.7"
                    ],
-      keywords='vapid',
+      keywords='vapid push webpush',
       author="JR Conlin",
       author_email="[email protected]",
       url='https://github.com/mozilla-services/vapid',
       license="MPL2",
       test_suite="nose.collector",
       include_package_data=True,
       zip_safe=False,
-      tests_require=['nose', 'coverage', 'mock>=1.0.1'],
       packages=find_packages(),
-      install_requires=REQS,
+      package_data={'': ['README.md', 'CHANGELOG.md',
+                         'requirements.txt', 'test-requirements.txt']},
+      install_requires=read_from('requirements.txt'),
+      tests_require=read_from('test-requirements.txt'),
       entry_points="""
       [console_scripts]
       vapid = py_vapid.main:main