Merge 30c2986 into f8c05c0

zopefoundation · Oct 7, 2020 · c9aae54 · c9aae54
2 parents f8c05c0 + 30c2986
commit c9aae54
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,9 +17,6 @@ matrix:
           env: TOXENV=py38
         - python: "3.9-dev"
           env: TOXENV=py39
-    allow_failures:
-        - python: "3.9-dev"
-          env: TOXENV=py39
 
 install:
     - travis_retry pip install -U pip setuptools

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -6,6 +6,8 @@ For changes before version 3.0, see ``HISTORY.rst``.
 5.0 (unreleased)
 ----------------
 
+- Add support for Python 3.9.
+
 - Remove deprecated classes and functions in
   (see `#32 <https://github.com/zopefoundation/AccessControl/issues/32>`_):
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -7,10 +7,14 @@ environment:
   matrix:
     - python: 27
     - python: 27-x64
+    - python: 35
+    - python: 35-x64
     - python: 36
     - python: 36-x64
     - python: 37
     - python: 37-x64
+    - python: 38
+    - python: 38-x64
 
 install:
   - "SET PATH=C:\\Python%PYTHON%;c:\\Python%PYTHON%\\scripts;%PATH%"

diff --git a/setup.py b/setup.py
@@ -66,6 +66,7 @@
           'Programming Language :: Python :: 3.6',
           'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: 3.8',
+          'Programming Language :: Python :: 3.9',
           'Programming Language :: Python :: Implementation :: CPython',
       ],
       ext_modules=ext_modules,
@@ -76,7 +77,7 @@
           'DateTime',  # optional dependency of RestrictedPython
           'ExtensionClass>=4.2.1',
           'Persistence>=3.0a3',
-          'RestrictedPython >= 4.0a1',
+          'RestrictedPython > 5.0',
           'six',
           'transaction',
           'zExceptions',

diff --git a/tox.ini b/tox.ini
@@ -5,6 +5,7 @@ envlist =
     py36,
     py37,
     py38,
+    py39,
     lint,
     coverage,
 
@@ -23,7 +24,7 @@ setenv =
     COVERAGE_FILE=.coverage.{envname}
 
 [testenv:coverage]
-basepython = python3.7
+basepython = python3.8
 commands =
     coverage erase
     coverage combine
@@ -36,7 +37,7 @@ setenv =
     COVERAGE_FILE=.coverage
 
 [testenv:lint]
-basepython = python3.6
+basepython = python3.8
 commands_pre =
     mkdir -p {toxinidir}/parts/lint
 commands =