From 6938733e5b2cacc88e4a52c727898fe922cf2384 Mon Sep 17 00:00:00 2001
From: Jason Madden <jamadden@gmail.com>
Date: Fri, 24 Aug 2018 06:12:12 -0500
Subject: [PATCH] Add support for Python 3.7; drop 3.3

Builds have been failing on 3.3 recently.

Also drop python setup.py test. Add some badges to README.rst.
---
 .travis.yml |  9 ++++++++-
 CHANGES.rst |  8 ++++++--
 README.rst  | 20 +++++++++++++++++---
 setup.py    | 22 +++-------------------
 tox.ini     |  2 +-
 5 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5f2016b..daecbf4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,14 @@ python:
     - 3.4
     - 3.5
     - 3.6
-    - pypy-5.4.1
+    - pypy
+    - pypy3
+matrix:
+  include:
+    - os: linux
+      dist: xenial
+      sudo: true
+      python: 3.7
 install:
   - pip install -U pip setuptools zope.testrunner
   - pip install -U coveralls coverage
diff --git a/CHANGES.rst b/CHANGES.rst
index dab36f7..8504313 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,10 +1,14 @@
 Changes
 =======
 
-4.2.1 (unreleased)
+4.3.0 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Add support for Python 3.7.
+
+- Drop support for Python 3.3.
+
+- Drop support for ``python setup.py test``.
 
 
 4.2.0 (2017-08-24)
diff --git a/README.rst b/README.rst
index 9bf7b27..2080c57 100644
--- a/README.rst
+++ b/README.rst
@@ -1,8 +1,22 @@
-``zope.securitypolicy``
-=======================
+=====================
+ zope.securitypolicy
+=====================
+
+.. image:: https://img.shields.io/pypi/v/zope.securitypolicy.svg
+   :target: https://pypi.python.org/pypi/zope.securitypolicy/
+   :alt: Latest release
+
+.. image:: https://img.shields.io/pypi/pyversions/zope.securitypolicy.svg
+   :target: https://pypi.org/project/zope.securitypolicy/
+   :alt: Supported Python versions
 
 .. image:: https://travis-ci.org/zopefoundation/zope.securitypolicy.svg?branch=master
-        :target: https://travis-ci.org/zopefoundation/zope.securitypolicy
+   :target: https://travis-ci.org/zopefoundation/zope.securitypolicy
+
+.. image:: https://coveralls.io/repos/github/zopefoundation/zope.securitypolicy/badge.svg?branch=master
+   :target: https://coveralls.io/github/zopefoundation/zope.securitypolicy?branch=master
+
+
 
 This package provides an useful security policy for Zope3. It's the
 default security policy used in "zope3 the application" and many other
diff --git a/setup.py b/setup.py
index c362578..a39e0ab 100644
--- a/setup.py
+++ b/setup.py
@@ -27,24 +27,9 @@ def read(*rnames):
         return f.read()
 
 
-def alltests():
-    import os
-    import sys
-    import unittest
-    # use the zope.testrunner machinery to find all the
-    # test suites we've put under ourselves
-    import zope.testrunner.find
-    import zope.testrunner.options
-    here = os.path.abspath(os.path.join(os.path.dirname(__file__), 'src'))
-    args = sys.argv[:]
-    defaults = ["--test-path", here]
-    options = zope.testrunner.options.get_options(args, defaults)
-    suites = list(zope.testrunner.find.find_suites(options))
-    return unittest.TestSuite(suites)
-
 setup(
     name='zope.securitypolicy',
-    version='4.2.1.dev0',
+    version='4.3.0.dev0',
     author='Zope Foundation and Contributors',
     author_email='zope-dev@zope.org',
     description='Default security policy for Zope3',
@@ -64,17 +49,17 @@ def alltests():
         'Programming Language :: Python :: 2',
         '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 :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Topic :: Internet :: WWW/HTTP',
         'Framework :: Zope3'],
-    url='http://pypi.python.org/pypi/zope.securitypolicy',
+    url='https://github.com/zopefoundation/zope.securitypolicy',
     license='ZPL 2.1',
     packages=find_packages('src'),
     package_dir={'': 'src'},
@@ -104,7 +89,6 @@ def alltests():
         'zope.testing',
         'zope.testrunner',
     ],
-    test_suite='__main__.alltests',
     include_package_data=True,
     zip_safe=False,
 )
diff --git a/tox.ini b/tox.ini
index c24c97d..cd4c33c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,10 @@
 [tox]
 envlist =
     py27,
-    py33,
     py34,
     py35,
     py36,
+    py37,
     pypy,
     pypy3,
     coverage-report,