Merge branch 'master' into simplify-pickling

.coveragerc

@@ -0,0 +1,12 @@
+[run]
+branch = True
+source = zope.securitypolicy
+
+[report]
+precision = 2
+
+[paths]
+source =
+    src/
+    .tox/py*/lib/python*/site-packages/
+    .tox/pypy*/site-packages/

.gitignore

@@ -1,10 +1,14 @@
 *.pyc
-__pycache__
+.coverage
+.coverage.*
 .installed.cfg
 .tox
+__pycache__
 bin/
+coverage.xml
 develop-eggs/
-eggs/
 dist/
+eggs/
+htmlcov/
 parts/
 src/*.egg-info

.travis.yml

@@ -5,11 +5,18 @@ python:
     - 3.3
     - 3.4
     - 3.5
-    - pypy
-    - pypy3
+    - 3.6
+    - pypy-5.4.1
 install:
-    - pip install .
+  - pip install -U pip setuptools zope.testrunner
+  - pip install -U coveralls coverage
+  - pip install -U -e ".[test]"
 script:
-    - python setup.py -q test -q
+  - coverage run -m zope.testrunner --test-path=src --auto-color
+after_success:
+  - coveralls
 notifications:
-    email: false
+  email: false
+cache: pip
+before_cache:
+  - rm -f $HOME/.cache/pip/log/debug.log

CHANGES.rst

@@ -4,7 +4,7 @@ Changes
 4.2.0 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Add support for Python 3.6.
 
 
 4.1.0 (2016-11-05)

setup.py

@@ -67,6 +67,7 @@ def alltests():
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Natural Language :: English',

tox.ini

@@ -1,24 +1,33 @@
 [tox]
 envlist =
-    py27,py33,py34,py35,pypy,pypy3
+    py27,
+    py33,
+    py34,
+    py35,
+    py36,
+    pypy,
+    pypy3,
+    coverage-report,
 
 [testenv]
 commands =
-    zope-testrunner -pvc --test-path=src 
-# without explicit deps, setup.py test will download a bunch of eggs into $PWD
-# (and it seems I can't use zope.dottedname[testing] here, so forget DRY)
+    coverage run -m zope.testrunner --test-path=src {posargs:-vc}
 deps =
-    persistent
-    zope.annotation
-    zope.authentication
-    zope.component
-    zope.configuration
-    zope.dublincore
-    zope.i18nmessageid
-    zope.interface
-    zope.location
-    zope.schema
-    zope.security
-    zope.testing
+    .[test]
     zope.testrunner
+    coverage
+setenv =
+    COVERAGE_FILE=.coverage.{envname}
 
+[testenv:coverage-report]
+basepython = python2.7
+deps = coverage
+setenv =
+    COVERAGE_FILE=.coverage
+skip_install = true
+commands =
+    coverage erase
+    coverage combine
+    coverage html
+    coverage xml
+    coverage report --show-missing