Merge branch 'master' into zope-interface-fix-inconsistent-iro

.travis.yml

@@ -1,23 +1,15 @@
 language: python
-sudo: false
-
 env:
   global:
     ZOPE_INTERFACE_STRICT_IRO: 1
-
 python:
     - 2.7
-    - 3.4
-    - 3.5
     - 3.6
+    - 3.7
+    - 3.8
+    - 3.9-dev
     - pypy
     - pypy3
-matrix:
-    include:
-        - python: "3.7"
-          dist: xenial
-          sudo: true
-
 install:
     - pip install -U pip setuptools
     - pip install -U coverage coveralls

CHANGES.rst

@@ -2,10 +2,12 @@
  CHANGES
 =========
 
-4.3.1 (unreleased)
+4.4.0 (unreleased)
 ==================
 
-- Nothing changed yet.
+- Add support for Python 3.8.
+
+- Drop support for Python 3.4 and 3.5.
 
 
 4.3.0 (2018-10-19)

setup.py

@@ -33,7 +33,7 @@ def read(*rnames):
 ]
 
 setup(name='zope.session',
-      version='4.3.1.dev0',
+      version='4.4.0.dev0',
       author='Zope Foundation and Contributors',
       author_email='zope-dev@zope.org',
       description='Client identification and sessions for Zope',
@@ -53,10 +53,9 @@ def read(*rnames):
           'Programming Language :: Python :: 2',
           'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.4',
-          'Programming Language :: Python :: 3.5',
           'Programming Language :: Python :: 3.6',
           'Programming Language :: Python :: 3.7',
+          'Programming Language :: Python :: 3.8',
           'Programming Language :: Python :: Implementation :: CPython',
           'Programming Language :: Python :: Implementation :: PyPy',
           'Natural Language :: English',

tox.ini

@@ -1,33 +1,31 @@
 [tox]
 envlist =
-    py27,py34,py35,py36,py37,pypy,pypy3,coverage,docs
+    py27,py36,py37,py38,py39,pypy,pypy3,coverage,docs
 
 [testenv]
 commands =
     zope-testrunner --test-path=src []
     sphinx-build -b doctest -d {envdir}/.cache/doctrees docs {envdir}/.cache/doctest
-deps =
-    .[test,docs]
 setenv =
     ZOPE_INTERFACE_STRICT_IRO = 1
+extras =
+    test
+    docs
 
 [testenv:coverage]
 usedevelop = true
 basepython =
-    python3.6
+    python3.8
 commands =
     coverage run -m zope.testrunner --test-path=src []
     coverage run -a -m sphinx -b doctest -d {envdir}/.cache/doctrees docs {envdir}/.cache/doctest
     coverage report --fail-under=100
 deps =
-    {[testenv]deps}
     coverage
 
 [testenv:docs]
 basepython =
-    python3.6
+    python3.8
 commands =
     sphinx-build -b doctest -d docs/_build/doctrees docs docs/_build/doctest
     sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html
-deps =
-    {[testenv]deps}