Merge 9f9b410 into 50f09de

zopefoundation · Aug 8, 2018 · 1f758bd · 1f758bd
2 parents 50f09de + 9f9b410
commit 1f758bd
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,9 @@ matrix:
     - python: 3.4
     - python: 3.5
     - python: 3.6
+    - python: 3.7
+      dist: xenial
+      sudo: true
     - python: pypy
     - python: pypy3
     - python: 2.7

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -13,6 +13,8 @@
   ``unicode`` is called. See `issue 10
   <https://github.com/zopefoundation/zope.security/issues/10>`_.
 
+- Add support for Python 3.7.
+
 
 4.2.1 (2017-11-30)
 ==================

diff --git a/appveyor.yml b/appveyor.yml
@@ -13,6 +13,8 @@ environment:
     - python: 35-x64
     - python: 36
     - python: 36-x64
+    - python: 37
+    - python: 37-x64
     - { python: 27, PURE_PYTHON: 1 }
     - { python: 35, PURE_PYTHON: 1 }
 

diff --git a/docs/proxy.rst b/docs/proxy.rst
@@ -343,12 +343,14 @@ In this case, the workarounds described :ref:`above <isinstance-and-proxies>` al
 .. pure-python platforms to make sure that we get where
 .. we expect to be when we construct LogRecord; otherwise
 .. the ProxyMetaclass may be in the negative cache, bypassing
-.. the issubclass() calls we expect
+.. the issubclass() calls we expect.
+.. Note that ABCMeta._abc_invalidation_counter is gone in Python 3.7
 
 .. doctest::
     :hide:
 
-    >>> ABCMeta._abc_invalidation_counter += 1
+    >>> if hasattr(ABCMeta, '_abc_invalidation_counter'):
+    ...     ABCMeta._abc_invalidation_counter += 1
 
 logging
 ~~~~~~~

diff --git a/setup.py b/setup.py
@@ -154,6 +154,7 @@ def __str__(self):
           'Programming Language :: Python :: 3.4',
           'Programming Language :: Python :: 3.5',
           'Programming Language :: Python :: 3.6',
+          'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: Implementation :: CPython',
           'Programming Language :: Python :: Implementation :: PyPy',
           'Natural Language :: English',

diff --git a/tox.ini b/tox.ini
@@ -3,7 +3,7 @@ envlist =
 # Jython support pending 2.7 support, due 2012-07-15 or so.  See:
 # http://fwierzbicki.blogspot.com/2012/03/adconion-to-fund-jython-27.html
 #   py27,pypy,jython,py33,coverage,docs
-    py27,py27-watch,pypy,pypy3,py34-watch,py34,py35,py36,coverage,docs
+    py27,py27-watch,pypy,pypy3,py34-watch,py34,py35,py36,py37,coverage,docs
 
 [testenv]
 commands =