From 43ead954b81b48db22a1aef92e3f773ddfda1270 Mon Sep 17 00:00:00 2001
From: Michael Howitz <mh@gocept.com>
Date: Fri, 13 Nov 2020 10:28:02 +0100
Subject: [PATCH] Add support for Python 3.9.

---
 .travis.yml |  8 +++++---
 CHANGES.rst |  4 +++-
 setup.py    | 35 ++++++++++++++++++-----------------
 tox.ini     |  1 +
 version.txt |  2 +-
 5 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9532510e..723298a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,13 +24,15 @@ matrix:
               - coveralls
         - python: "3.8"
           env: TOXENV=py38
+        - python: "3.9"
+          env: TOXENV=py39
 
 install:
-    - travis_retry pip install -U pip setuptools tox
-    - travis_retry pip install -U coverage coveralls
+    - pip install -U pip setuptools tox
+    - pip install -U coverage coveralls
 
 script:
-    - travis_retry tox
+    - tox
 
 notifications:
     email: false
diff --git a/CHANGES.rst b/CHANGES.rst
index d71a51a8..55c96dee 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,11 +1,13 @@
 Change Log
 ==========
 
-2.5.1 (unreleased)
+2.6.0 (unreleased)
 ------------------
 
 - Fix DeprecationWarnings occurring on Zope 5.
 
+- Add support for Python 3.9.
+
 
 2.5 (2020-10-12)
 ----------------
diff --git a/setup.py b/setup.py
index 1e9dec29..9df16e1f 100644
--- a/setup.py
+++ b/setup.py
@@ -29,22 +29,23 @@ def _package_doc(name):
       description='Pluggable Zope authentication / authorization framework',
       long_description=README,
       classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Framework :: Plone',
-        'Framework :: Zope :: 4',
-        'Framework :: Zope :: 5',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: Zope Public License',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Topic :: Software Development',
-        'Topic :: System :: Systems Administration :: '
-        'Authentication/Directory',
-        ],
+          'Development Status :: 5 - Production/Stable',
+          'Framework :: Plone',
+          'Framework :: Zope :: 4',
+          'Framework :: Zope :: 5',
+          'Intended Audience :: Developers',
+          'License :: OSI Approved :: Zope Public License',
+          'Programming Language :: Python',
+          'Programming Language :: Python :: 2.7',
+          'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3.6',
+          'Programming Language :: Python :: 3.7',
+          'Programming Language :: Python :: 3.8',
+          'Programming Language :: Python :: 3.9',
+          'Topic :: Software Development',
+          'Topic :: System :: Systems Administration :: '
+          'Authentication/Directory',
+      ],
       keywords='web application server zope',
       author='Zope Foundation and Contributors',
       author_email='zope-cmf@zope.org',
@@ -72,7 +73,7 @@ def _package_doc(name):
           'Products.GenericSetup >= 2.0b1',
           'Products.Sessions',
           'Products.StandardCacheManagers',
-          ],
+      ],
       extras_require={
           'ip_range': ['IPy'],
           'zserver': ['ZServer >= 4.0a1'],
diff --git a/tox.ini b/tox.ini
index b66b24fe..5a7ba8fb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,6 +8,7 @@ envlist =
     py37,
     py37-ip_range,
     py38,
+    py39,
     coverage-report,
 
 [testenv]
diff --git a/version.txt b/version.txt
index 0628f7d6..2a45a8a5 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-2.5.1.dev0
+2.6.0.dev0