merged master/ZEO5

.travis.yml

 language: python
 sudo: false
 python:
-    - 2.6
     - 2.7
-    - 3.2
     - 3.3
     - 3.4
     - pypy
 install:
-    - pip install -U setuptools distribute
+    - pip install -U setuptools
     - python bootstrap.py
     - bin/buildout
 script:

CHANGES.rst

@@ -4,7 +4,7 @@ Changelog
 4.2.0 (unreleased)
 ------------------
 
-- TBD
+- Drop support for Python 2.6 and 3.2.
 
 4.2.0b1 (2015-06-05)
 --------------------

setup.py

@@ -18,14 +18,18 @@ from setuptools import setup, find_packages
 import os
 import sys
 
-if sys.version_info < (2, 6):
-    print("This version of ZEO requires Python 2.6 or higher")
+if sys.version_info < (2, 7):
+    print("This version of ZEO requires Python 2.7 or higher")
     sys.exit(0)
 
+if (3, 0) < sys.version_info < (3, 3):
+    print("This version of ZEO requires Python 3.3 or higher")
+    sys.exit(0)
+
+
 classifiers = """\
 Intended Audience :: Developers
 License :: OSI Approved :: Zope Public License
-Programming Language :: Python
 Programming Language :: Python :: 3
 Programming Language :: Python :: 3.4
 Programming Language :: Python :: 3.5

tox.ini

@@ -26,5 +26,5 @@ deps =
 basepython =
     python3.4
 commands =
-    python setup.py test -q
+    python setup.py -q test -q
 deps = {[testenv]deps}