diff --git a/setup.py b/setup.py
index 3426b80d1671d0098c609a58e5c4fb5091e3741a..8fe03db6e38a8a163c7d92e1d990ecf15e61d512 100644 (file)
--- a/setup.py
+++ b/setup.py
from roundup.dist.command.build_py import build_py
from roundup.dist.command.build import build, list_message_files
from roundup.dist.command.bdist_rpm import bdist_rpm
+from roundup.dist.command.install_lib import install_lib
from distutils.core import setup
import sys, os
# perform the setup action
from roundup import __version__
+ # long_description may not contain non-ascii characters. Distutils
+ # will produce an non-installable installer on linux *and* we can't
+ # run the bdist_wininst on Linux if there are non-ascii characters
+ # because the distutils installer will try to use the mbcs codec
+ # which isn't available on non-windows platforms. See also
+ # http://bugs.python.org/issue10945
long_description=open('doc/announcement.txt').read().decode('utf8')
try:
- long_description.encode('ascii')
+ long_description = long_description.encode('ascii')
except UnicodeEncodeError, cause:
print >> sys.stderr, "doc/announcement.txt contains non-ascii: %s" \
% cause
'build_py': build_py,
'build': build,
'bdist_rpm': bdist_rpm,
+ 'install_lib': install_lib,
},
packages=packages,
py_modules=py_modules,