Merge pull request #55 from zopefoundation/update_supported_versions

Update supported versions

.gitignore

@@ -3,6 +3,7 @@
 __pycache__
 src/*.egg-info
 benchmark/*.egg-info
+.eggs/
 .project
 .pydevproject
 .installed.cfg

.travis.yml

@@ -3,14 +3,14 @@ cache:
   directories:
     - .tox
 language: python
-env:
-    - TOXENV=py26
-    - TOXENV=py27
-    - TOXENV=py33
-    - TOXENV=py34
+python:
+    - 2.7
+    - 3.3
+    - 3.4
+    - 3.5
 install:
     - travis_retry pip install tox
 script:
-    - tox
+    - tox -e py
 notifications:
     email: false

CHANGES.txt

@@ -2,9 +2,13 @@
 CHANGES
 =======
 
-3.3.1 (unreleased)
+3.4.0 (unreleased)
 ------------------
 
+- Drop support for Python 2.6.
+
+- Support Python 3.5 officially.
+
 - Fix TypeError: object of type 'generator' has no ``len()``.
   Happens with z3c.formwidget.query.  [maurits]
 

MANIFEST.in

@@ -6,5 +6,5 @@ include buildout.cfg
 include dev.cfg
 include tox.ini
 include .travis.yml
-recursive-include src/z3c/form *.zcml *.pt *.js *.txt *.png *.dot *.ps *.po *.pot
+recursive-include src/z3c/form *.zcml *.pt *.js *.txt *.png *.dot *.ps *.po *.pot *.css
 recursive-include benchmark *.py

setup.py

@@ -64,7 +64,7 @@ def alltests():
 
 setup(
     name='z3c.form',
-    version='3.3.1.dev0',
+    version='3.4.0.dev0',
     author="Stephan Richter, Roger Ineichen and the Zope Community",
     author_email="zope-dev@zope.org",
     description="An advanced form and widget framework for Zope 3",
@@ -83,11 +83,11 @@ def alltests():
         'License :: OSI Approved :: Zope Public License',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: Implementation :: CPython',
         'Natural Language :: English',
         'Operating System :: OS Independent',

tox.ini

@@ -1,36 +1,10 @@
 [tox]
 envlist =
-    py26,py27,py33,py34
+    py27,py33,py34,py35
 
 [testenv]
 commands =
-    python setup.py test -q
-# without explicit deps, setup.py test will download a bunch of eggs into $PWD
-# (and it seems I can't use zope.dottedname[testing] here, so forget DRY)
+    zope-testrunner --test-path=src {posargs:-pvc}
 deps =
-    lxml
-    persistent
-    z3c.template>=2.0.0a1
-    zc.sourcefactory>=1.0.0a1
-    zope.browser
-    zope.browserresource
-    zope.component
-    zope.configuration
-    zope.container
-    zope.contentprovider
-    zope.event
-    zope.i18n
-    zope.i18nmessageid
-    zope.interface
-    zope.lifecycleevent
-    zope.location
-    zope.pagetemplate
-    zope.password
-    zope.publisher
-    zope.schema
-    zope.security
-    zope.site
-    zope.testing
+    .[test]
     zope.testrunner
-    zope.traversing
-