Merge branch 'feature/issue-11-fix-source-dists' into develop

hodgestar · hodgestar · commit 24e64462d5fc · 2015-09-24T11:12:00.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ python:
 install:
     - pip install coveralls
     - pip install -r requirements.pip
+    - pip install -r requirements-dev.pip
 script:
     - ./run-tests.sh
 after_success:
diff --git a/LICENSE b/LICENSE
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,6 +1,7 @@
-exclude test/*
-exclude tests.py
-exclude *.egg-info/*
-include LICENCE
+# Source distribution files.
+include LICENSE
 include README.rst
-include requirements.pip
+include requirements.pip requirements-dev.pip
+include setup.py setup.cfg
+
+exclude test/*
diff --git a/requirements-dev.pip b/requirements-dev.pip
@@ -0,0 +1,3 @@
+nose
+coverage
+pep8
diff --git a/requirements.pip b/requirements.pip
@@ -1,3 +1,2 @@
-nose
-coverage
-pep8
+# Our dependencies are all specified in setup.py.
+-e .
diff --git a/setup.py b/setup.py
@@ -2,11 +2,6 @@
 from setuptools import setup, find_packages
 
 
-def listify(filename):
-    filepath = os.path.join(os.path.dirname(__file__), filename)
-    return filter(None, open(filepath, 'r').readlines())
-
-
 def read_file(filename):
     filepath = os.path.join(os.path.dirname(__file__), filename)
     return open(filepath, 'r').read()
@@ -21,7 +16,8 @@ def read_file(filename):
     author='Praekelt Foundation',
     author_email='dev@praekeltfoundation.org',
     packages=find_packages(),
-    install_requires=['setuptools'].extend(listify('requirements.pip')),
+    install_requires=[
+    ],
     classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',

-Original file line number
+Diff line change
@@ @@ -1,3 +1,2 @@ @@
 -nose
 -coverage
 -pep8
 +# Our dependencies are all specified in setup.py.
 +-e .