Merge branch 'release/2.2.0'

Conflicts:
	textile/core.py
	textile/tests/__init__.py

Author: ikirudennis

.travis.yml

@@ -0,0 +1,13 @@
+language: python
+python:
+  - "2.6"
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
+# command to install dependencies
+install:
+  - if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]] ; then pip install ordereddict; fi
+  - pip install -r requirements.txt
+# command to run tests
+script: nosetests

CONTRIBUTORS.txt

@@ -1,4 +1,5 @@
 Dennis Burke
+Radek Czajka
 Roberto A. F. De Almeida
 Matt Layman
 Mark Pilgrim

requirements.txt

@@ -0,0 +1,5 @@
+nose==1.3.4
+coverage==3.7.1
+html5lib==0.999
+regex==2014.10.07
+Pillow==2.6.0

setup.py

@@ -1,9 +1,8 @@
 from setuptools import setup, find_packages
+import os
 import sys
 
-from textile import __version__
-
-install_requires = []
+install_requires = ['regex']
 
 try:
     from collections import OrderedDict
@@ -15,9 +14,17 @@
         'tox',
     ])
 
+def get_version():
+    basedir = os.path.dirname(__file__)
+    with open(os.path.join(basedir, 'textile/version.py')) as f:
+        variables = {}
+        exec(f.read(), variables)
+        return variables.get('VERSION')
+    raise RuntimeError('No version info found.')
+
 setup(
     name='textile',
-    version=__version__,
+    version=get_version(),
     description='Textile processing for python.',
     url='http://github.com/ikirudennis/python-textile',
     packages=find_packages(),

textile/__init__.py

@@ -1,5 +1,8 @@
-from .functions import textile, textile_restricted, Textile
+from __future__ import unicode_literals
+
+from .core import textile, textile_restricted, Textile
+from .version import VERSION
 
 __all__ = ['textile', 'textile_restricted']
 
-__version__ = '2.1.8'
+__version__ = VERSION