diff options
author | Christopher Baines <mail@cbaines.net> | 2015-12-06 13:31:51 +0000 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2015-12-06 13:31:51 +0000 |
commit | 4cf150e98a62a0bcc307065a050f7d3a592289a2 (patch) | |
tree | 584483fb7e5e200b91b8f4a09a61d8253a5b597c /setup.py | |
parent | 25893d8e7894f3e77f3f8ce9a6b84132968c15a9 (diff) | |
parent | 11b8160e584470439c8c0b3ab51012c9300f6788 (diff) | |
download | python-bleach-4cf150e98a62a0bcc307065a050f7d3a592289a2.tar python-bleach-4cf150e98a62a0bcc307065a050f7d3a592289a2.tar.gz |
Merge tag 'upstream/1.4.2'
Upstream version 1.4.2
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 25 |
1 files changed, 20 insertions, 5 deletions
@@ -1,8 +1,22 @@ from setuptools import setup, find_packages +install_requires = [ + 'six', + 'html5lib>=0.999', +] + +try: + from collections import OrderedDict # noqa +except ImportError: + # We don't use ordereddict, but html5lib does when you request + # alpha-sorted attributes and on Python 2.6 and it doesn't specify it + # as a dependency (see + # https://github.com/html5lib/html5lib-python/pull/177) + install_requires.append('ordereddict') + setup( name='bleach', - version='1.4', + version='1.4.2', description='An easy whitelist-based HTML-sanitizing tool.', long_description=open('README.rst').read(), author='James Socol', @@ -13,14 +27,14 @@ setup( include_package_data=True, package_data={'': ['README.rst']}, zip_safe=False, - install_requires=[ - 'six', - 'html5lib>=0.999', + install_requires=install_requires, + tests_require=[ + 'nose>=1.3', ], + test_suite='nose.collector', classifiers=[ 'Development Status :: 5 - Production/Stable', 'Environment :: Web Environment', - 'Environment :: Web Environment :: Mozilla', 'Intended Audience :: Developers', 'License :: OSI Approved :: Apache Software License', 'Operating System :: OS Independent', @@ -31,6 +45,7 @@ setup( 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.2', 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', 'Topic :: Software Development :: Libraries :: Python Modules', ] ) |