Merge branch 'develop'

.travis.yml

@@ -0,0 +1,15 @@
+language: python
+python:
+ - "2.5"
+ - "2.6"
+ - "2.7"
+# Someday, soon.
+# - "3.2"
+install: python setup.py install
+script: python setup.py test
+notifications:
+    email: false
+    irc:
+        - "irc.freenode.net#toscawidgets"
+    on_success: change
+    on_failure: always

README.rst

@@ -0,0 +1,27 @@
+ToscaWidgets 
+============
+
+ToscaWidgets is a web widget toolkit for Python to aid in the creation,
+packaging and distribution of common view elements normally used in the web.
+
+tw2.forms contains the basic form widgets.
+
+Build Status
+------------
+
+.. |master| image:: https://secure.travis-ci.org/toscawidgets/tw2.forms.png?branch=master
+   :alt: Build Status - master branch
+   :target: http://travis-ci.org/#!/toscawidgets/tw2.forms
+
+.. |develop| image:: https://secure.travis-ci.org/toscawidgets/tw2.forms.png?branch=develop
+   :alt: Build Status - develop branch
+   :target: http://travis-ci.org/#!/toscawidgets/tw2.forms
+
++----------+-----------+
+| Branch   | Status    |
++==========+===========+
+| master   | |master|  |
++----------+-----------+
+| develop  | |develop| |
++----------+-----------+
+

setup.py

@@ -1,3 +1,5 @@
+import sys
+
 from setuptools import setup, find_packages
 
 try:
@@ -12,17 +14,22 @@
 _extra_kid = ["kid>=0.9.5", "TurboKid>=0.9.9"]
 _extra_mako = ["Mako >= 0.1.1"]
 
+requires=[
+    "tw2.core",
+]
+
+if sys.version_info[0] == 2 and sys.version_info[1] <= 5:
+    requires.append('WebOb<=1.1.1')
+
 setup(
     name='tw2.forms',
     version='2.0.3',
     description='The basic form widgets for ToscaWidgets 2.',
-    long_description = open('README.txt').read().split('\n\n', 1)[1],
+    long_description = open('README.rst').read().split('\n\n', 1)[1],
     author='Paul Johnston, Christopher Perkins, Alberto Valverde & contributors',
     author_email='paj@pajhome.org.uk',
     url='http://toscawidgets.org',
-    install_requires=[
-        "tw2.core>=2.0b4",
-        ],
+    install_requires=requires,
     packages=find_packages(exclude=['ez_setup', 'tests']),
     namespace_packages = ['tw2'],
     zip_safe=False,