Skip to content

Commit

Permalink
Merge db43586 into 9bfb99c
Browse files Browse the repository at this point in the history
  • Loading branch information
hodgestar committed Sep 24, 2015
2 parents 9bfb99c + db43586 commit cb39725
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
File renamed without changes.
11 changes: 6 additions & 5 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -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/*
3 changes: 3 additions & 0 deletions requirements-dev.pip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nose
coverage
pep8
5 changes: 2 additions & 3 deletions requirements.pip
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
nose
coverage
pep8
# Our dependencies are all specified in setup.py.
-e .
8 changes: 2 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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',
Expand Down

0 comments on commit cb39725

Please sign in to comment.