manually merge in changes from py32 branch.

Author: ikirudennis

.gitignore

@@ -15,3 +15,5 @@ eggs
 parts
 develop-eggs
 .DS_Store
+*.swp
+*.tox

CONTRIBUTORS.txt

@@ -1,5 +1,7 @@
-Mark Pilgrim
+Dennis Burke
 Roberto A. F. De Almeida
+Matt Layman
+Mark Pilgrim
 Alex Shiels
 Jason Samsa
 Kurt Raschke

setup.py

@@ -1,17 +1,23 @@
 from setuptools import setup, find_packages
+import sys
 
-version = __import__('textile').__version__
+from textile import __version__
+
+install_requires = []
+
+if 'develop' in sys.argv:
+    install_requires.extend([
+        'tox',
+    ])
 
 setup(
     name='textile',
-    version=version,
+    version=__version__,
     description='Textile processing for python.',
-    author='Chris Drackett',
-    author_email='chris@chrisdrackett.com',
-    url='http://github.com/chrisdrackett/python-textile',
+    url='http://github.com/ikirudennis/python-textile',
     packages=find_packages(),
     classifiers=[
-        'Development Status :: 3 - Alpha',
+        'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
@@ -20,8 +26,10 @@
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
     keywords='textile,text',
+    install_requires=install_requires,
     test_suite='nose.collector',
     tests_require=['nose'],
     include_package_data=True,
     zip_safe=False,
 )
+

tox.ini

@@ -0,0 +1,7 @@
+[tox]
+envlist = py27, py32, py34
+
+[testenv]
+deps = nose
+coverage
+commands = nosetests