Merge 06ac785 into 283bf06

zopefoundation · Oct 7, 2020 · 01b9cfe · 01b9cfe
2 parents 283bf06 + 06ac785
commit 01b9cfe
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 208 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,21 +3,19 @@ python:
     - 2.7
     - 3.5
     - 3.6
+    - 3.7
+    - 3.8
+    - 3.9
 matrix:
     include:
-        - python: "3.7"
-          dist: xenial
-        - python: "3.8"
-          dist: xenial
-        - python: 3.6
+        - python: 3.8
           name: "Flake8"
           install:  pip install -U flake8
           script: flake8 --doctests src setup.py
           after_success:
 install:
     - pip install zc.buildout
     - pip install coveralls coverage
-    - buildout bootstrap
     - buildout install test
 script:
     - coverage run bin/test -v1

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -24,6 +24,8 @@ Changelog
 - Remove deprecated ``Products.PluginIndexes.common`` module and ``Products.ZCatalog.Lazy``.
   (`#54 <https://github.com/zopefoundation/Products.ZCatalog/issues/54>`_)
 
+- Add support for Python 3.9.
+
 
 5.1 (2020-04-20)
 ----------------

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -4,17 +4,12 @@ include .coveragerc
 include buildout.cfg
 include tox.ini
 
-include *.py
-exclude bootstrap.py
-
 include .gitignore
 exclude .gitignore
 
 include .travis.yml
 exclude .travis.yml
 
-exclude MANIFEST.in
-
 recursive-include src *
 
 global-exclude *.pyc

diff --git a/bootstrap.py b/bootstrap.py
diff --git a/buildout.cfg b/buildout.cfg
@@ -2,12 +2,13 @@
 extends =
     https://zopefoundation.github.io/Zope/releases/4.x/versions.cfg
 develop = .
-parts = 
-    interpreter 
-    test 
+parts =
+    interpreter
+    test
 
 [versions]
 Products.ZCatalog =
+RestrictedPython = >= 5.1
 
 [interpreter]
 recipe = zc.recipe.egg

diff --git a/setup.cfg b/setup.cfg
@@ -1,11 +1,9 @@
 [check-manifest]
 ignore =
     *.cfg
-    bootstrap.py
 
 [flake8]
 ignore = W503 # line break before binary operator
-exclude = bootstrap.py
 
 [bdist_wheel]
 universal = 1
diff --git a/setup.py b/setup.py
@@ -43,6 +43,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",
         "Topic :: Internet :: WWW/HTTP :: Indexing/Search",
     ],
@@ -60,7 +61,7 @@
         'Missing',
         'Persistence',
         'Record',
-        'RestrictedPython',
+        'RestrictedPython >= 5.1',
         'zExceptions',
         'ZODB',
         'Zope >= 4',

diff --git a/tox.ini b/tox.ini
@@ -6,6 +6,7 @@ envlist =
    py36,
    py37,
    py38,
+   py39,
    coverage-report,
 
 [testenv]
@@ -21,7 +22,7 @@ setenv =
     COVERAGE_FILE=.coverage.{envname}
 
 [testenv:coverage-report]
-basepython = python3.6
+basepython = python3
 deps =
     {[testenv]deps}
 setenv =
@@ -34,7 +35,7 @@ commands =
     coverage report -i --skip-covered --fail-under=87
 
 [testenv:flake8]
-basepython = python3.6
+basepython = python3
 deps =
     flake8
     flake8-debugger