Merge branch 'release/2.2.1'

Author: ikirudennis

.travis.yml

@@ -7,7 +7,7 @@ python:
   - "3.4"
 # command to install dependencies
 install:
-  - if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]] ; then pip install ordereddict; fi
   - pip install -r requirements.txt
+  - python setup.py -q install
 # command to run tests
 script: nosetests

CHANGELOG.textile

@@ -0,0 +1,19 @@
+h1. Textile Changelog
+
+h1. Version 2.2.1
+
+* drop textilefactory support for html.
+* Various development-related bugfixes.
+* Added this changelog.
+
+h1. Version 2.2.0
+
+* Started refactoring the code to be less repetitive.  @textile.Textile().parse()@ is a little more friendly than @textile.Textile().textile()@  There may be more work to be done on this front to make the flow a little smoother.
+* We now support versions 2.6 - 3.4 (including 3.2) using the same codebase.  Many thanks to Radek Czajka for this.
+* Drop support for html4.  We now only output xhtml or html5.
+* Various development-related bugfixes.
+
+h1. Version 2.1.8
+
+* Add support for html5 output.
+* Lots of new functionality added bringing us in line with the official Textile 2.4

README.textile

@@ -1,3 +1,5 @@
+!https://travis-ci.org/textile/python-textile.svg?branch=develop!:https://travis-ci.org/textile/python-textile
+
 h1. python-textile
 
 python-textile is a Python port of Textile, Dean Allen's humane web text generator.

requirements.txt

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

setup.cfg

@@ -5,3 +5,5 @@ cover-package=textile
 cover-erase=1
 with-doctest=1
 with-id = 1
+[bdist_wheel]
+universal=1

setup.py

@@ -26,7 +26,7 @@ def get_version():
     name='textile',
     version=get_version(),
     description='Textile processing for python.',
-    url='http://github.com/ikirudennis/python-textile',
+    url='http://github.com/textile/python-textile',
     packages=find_packages(),
     classifiers=[
         'Development Status :: 5 - Production/Stable',

textile/textilefactory.py

@@ -31,7 +31,7 @@ class TextileFactory(object):
     >>> f = TextileFactory(html_type='invalid')
     Traceback (most recent call last):
     ...
-    ValueError: html_type must be 'html', 'xhtml', or 'html5'
+    ValueError: html_type must be 'xhtml' or 'html5'
 
 
     """
@@ -67,8 +67,8 @@ def __init__(self, restricted=False, lite=False, sanitize=False,
         else:
             self.method_parms['head_offset'] = head_offset
 
-        if html_type not in ['html', 'xhtml', 'html5']:
-            raise ValueError("html_type must be 'html', 'xhtml', or 'html5'")
+        if html_type not in ['xhtml', 'html5']:
+            raise ValueError("html_type must be 'xhtml' or 'html5'")
         else:
             self.class_parms['html_type'] = html_type
 

textile/version.py

@@ -1 +1 @@
-VERSION = '2.2.0'
+VERSION = '2.2.1'