Skip to content

Commit

Permalink
Fix MANIFEST.in and remove workaround from setup.py
Browse files Browse the repository at this point in the history
  • Loading branch information
mgedmin committed Dec 17, 2014
1 parent bea796f commit 949a766
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
7 changes: 7 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
include *.txt
include *.rst

recursive-include docs *
recursive-include persistent *
Expand All @@ -7,3 +8,9 @@ global-exclude *.dll
global-exclude *.pyc
global-exclude *.pyo
global-exclude *.so

include .coveragerc
include .travis.yml
include buildout.cfg
include tox.ini
include *.py
9 changes: 4 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,11 @@

here = os.path.abspath(os.path.dirname(__file__))


def _read_file(filename):
try:
with open(os.path.join(here, filename)) as f:
return f.read()
except IOError: # Travis???
return ''
with open(os.path.join(here, filename)) as f:
return f.read()


README = (_read_file('README.rst') + '\n\n' + _read_file('CHANGES.rst'))

Expand Down

0 comments on commit 949a766

Please sign in to comment.