# HG changeset patch # User fschwarz # Date 1344429363 0 # Node ID c8bef607128cbc59ea61679bbba50a1c1f57b988 # Parent acdb8f9c9ce6fef969c3202f8a623e29a430037e no warnings when running setup.py without installed setuptools (#262) diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ * fix handling of messages containing '\\n' (#198) * handle irregular multi-line msgstr (no "" as first line) gracefully (#171) * parse_decimal() now returns Decimals not floats, API change (#178) + * no warnings when running setup.py without installed setuptools (#262) Version 0.9.6 diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -15,8 +15,10 @@ import os try: from setuptools import setup + have_setuptools = True except ImportError: from distutils.core import setup + have_setuptools = False import sys sys.path.append(os.path.join('doc', 'common')) @@ -26,6 +28,37 @@ build_doc = test_doc = None +extra_arguments = dict() +if have_setuptools: + extra_arguments = dict( + zip_safe = False, + test_suite = 'babel.tests.suite', + tests_require = ['pytz'], + + entry_points = """ + [console_scripts] + pybabel = babel.messages.frontend:main + + [distutils.commands] + compile_catalog = babel.messages.frontend:compile_catalog + extract_messages = babel.messages.frontend:extract_messages + init_catalog = babel.messages.frontend:init_catalog + update_catalog = babel.messages.frontend:update_catalog + + [distutils.setup_keywords] + message_extractors = babel.messages.frontend:check_message_extractors + + [babel.checkers] + num_plurals = babel.messages.checkers:num_plurals + python_format = babel.messages.checkers:python_format + + [babel.extractors] + ignore = babel.messages.extract:extract_nothing + python = babel.messages.extract:extract_python + javascript = babel.messages.extract:extract_javascript + """, + ) + setup( name = 'Babel', version = '1.0', @@ -37,7 +70,6 @@ license = 'BSD', url = 'http://babel.edgewall.org/', download_url = 'http://babel.edgewall.org/wiki/Download', - zip_safe = False, classifiers = [ 'Development Status :: 4 - Beta', @@ -50,31 +82,8 @@ ], packages = ['babel', 'babel.messages'], package_data = {'babel': ['global.dat', 'localedata/*.dat']}, - test_suite = 'babel.tests.suite', - tests_require = ['pytz'], - entry_points = """ - [console_scripts] - pybabel = babel.messages.frontend:main - - [distutils.commands] - compile_catalog = babel.messages.frontend:compile_catalog - extract_messages = babel.messages.frontend:extract_messages - init_catalog = babel.messages.frontend:init_catalog - update_catalog = babel.messages.frontend:update_catalog + cmdclass = {'build_doc': build_doc, 'test_doc': test_doc}, - [distutils.setup_keywords] - message_extractors = babel.messages.frontend:check_message_extractors - - [babel.checkers] - num_plurals = babel.messages.checkers:num_plurals - python_format = babel.messages.checkers:python_format - - [babel.extractors] - ignore = babel.messages.extract:extract_nothing - python = babel.messages.extract:extract_python - javascript = babel.messages.extract:extract_javascript - """, - - cmdclass = {'build_doc': build_doc, 'test_doc': test_doc} + **extra_arguments )