From ab8282a6e703279769d7d9de50e81647b582f855 Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Mon, 30 Oct 2017 16:21:55 +0200
Subject: [PATCH] Enable Python 3 on Travis and everywhere

We can do that now that zope.server 4.0.0 is out on PyPI.
---
 .travis.yml | 13 ++++++++++---
 CHANGES.txt |  4 ++--
 MANIFEST.in |  4 ++++
 setup.py    | 14 ++++++++++----
 tox.ini     |  3 +--
 5 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dce0257..b9aa3fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,17 @@
 language: python
+sudo: false
+cache: pip
 python:
     - 2.7
+    - 3.4
+    - 3.5
+    - 3.6
 install:
-    - python bootstrap.py
-    - bin/buildout
+    - pip install coveralls coverage
+    - pip install -e ".[test]"
 script:
-    - bin/test -v1
+    - coverage run -m zope.testrunner --test-path=src -pvc
+after_success:
+    - coveralls
 notifications:
     email: false
diff --git a/CHANGES.txt b/CHANGES.txt
index ca9c033..2224031 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,10 +2,10 @@
 CHANGES
 =======
 
-3.6.1 (unreleased)
+4.0.0 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Add support for Python 3.4, 3.5, and 3.6
 
 
 3.6.0 (2011-03-23)
diff --git a/MANIFEST.in b/MANIFEST.in
index f9c10d6..b17e20d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,3 +4,7 @@ include buildout.cfg
 recursive-include src *.in
 recursive-include src *.xml
 recursive-include src *.zcml
+
+# added by check_manifest.py
+include .coveragerc
+include tox.ini
diff --git a/setup.py b/setup.py
index 3b3f8e6..a1525ce 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@ def read(*rnames):
 
 setup(
     name='zope.app.server',
-    version='3.6.1dev',
+    version='4.0.0dev',
     author='Zope Corporation and Contributors',
     author_email='zope-dev@zope.org',
     description='ZServer integration for Zope 3 Applications',
@@ -45,17 +45,23 @@ def read(*rnames):
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Zope Public License',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Topic :: Internet :: WWW/HTTP',
-        'Framework :: Zope3'],
-    url='http://cheeseshop.python.org/pypi/zope.app.server',
+        'Framework :: Zope3',
+    ],
+    url='https://github.com/zopefoundation/zope.app.server',
     license='ZPL 2.1',
     packages=find_packages('src'),
     package_dir={'': 'src'},
     namespace_packages=['zope', 'zope.app'],
     extras_require=dict(
         test=[
+            'zope.testrunner',
             'zope.app.testing',
         ],
     ),
@@ -70,7 +76,7 @@ def read(*rnames):
         'zope.event',
         'zope.interface',
         'zope.publisher',
-        'zope.server',
+        'zope.server >= 4.0',
         'zope.password >= 3.6',
         'zope.processlifetime',
         'zdaemon',
diff --git a/tox.ini b/tox.ini
index b0d2e58..e64ec42 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,8 @@
 [tox]
-envlist = py27
+envlist = py27, py34, py35, py36
 
 [testenv]
 deps =
-    zope.testrunner
     .[test]
 commands =
     zope-testrunner --test-path=src {posargs:-pvc}