X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=setup.py;h=8fe03db6e38a8a163c7d92e1d990ecf15e61d512;hb=50b2a9c9dce56a5e9eac4ecad7cb28bcce449f8b;hp=5908f9730961545f63d7e5062c71db6a44db3211;hpb=b4581121d0fdf28c07e9b156f49eedde470d4c82;p=roundup.git

diff --git a/setup.py b/setup.py
index 5908f97..8fe03db 100644
--- a/setup.py
+++ b/setup.py
@@ -23,6 +23,7 @@ from roundup.dist.command.build_scripts import build_scripts
 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
@@ -94,6 +95,20 @@ def main():
     # 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 = long_description.encode('ascii')
+    except UnicodeEncodeError, cause:
+        print >> sys.stderr, "doc/announcement.txt contains non-ascii: %s" \
+            % cause
+        sys.exit(42)
+
     setup(name='roundup',
           version=__version__,
           author="Richard Jones",
@@ -101,7 +116,7 @@ def main():
           description="A simple-to-use and -install issue-tracking system"
             " with command-line, web and e-mail interfaces. Highly"
             " customisable.",
-          long_description=open('doc/announcement.txt').read(),
+          long_description=long_description,
           url='http://www.roundup-tracker.org',
           download_url='http://pypi.python.org/pypi/roundup',
           classifiers=['Development Status :: 5 - Production/Stable',
@@ -126,6 +141,7 @@ def main():
                      'build_py': build_py,
                      'build': build,
                      'bdist_rpm': bdist_rpm,
+                     'install_lib': install_lib,
                      },
           packages=packages,
           py_modules=py_modules,