Merge branch 'compatibility_imorts_of_abstract_classes_#451'

.travis.yml

@@ -6,6 +6,7 @@ python:
   - 3.4
   - 3.5
   - 3.6
+  - 3.7-dev  # FIXME when 3.7 is available
   - pypy
   - pypy3
 install: travis_retry pip install tox-travis

CHANGES.rst

@@ -20,6 +20,7 @@ New
   the next major release of Cerbers (`#385`_)
 - The ``meta`` pseudo-rule can be used to store arbitrary application data
   related to a field in a schema
+- Python 3.7 officially supported (`#451`_)
 - **Python 2.6 and 3.3 are no longer supported**
 
 Fixed
@@ -31,6 +32,7 @@ Fixed
 
 Improved
 ~~~~~~~~
+- Suppress DeprecationWarning about collections.abc (`#451`_)
 - Omit warning when no schema for ``meta`` rule constraint is available (`#425`_)
 - Add ``.eggs`` to .gitignore file (`#420`_)
 - Reformat code to match Black code-style (`#402`_)
@@ -59,6 +61,7 @@ Docs
 - Add a few clarifications to the GitHub issue template
 - Update README link; make it point to the new PyPI website
 
+.. _`#451`: https://github.com/pyeve/cerberus/pull/451
 .. _`#435`: https://github.com/pyeve/cerberus/pull/435
 .. _`#429`: https://github.com/pyeve/cerberus/pull/429
 .. _`#425`: https://github.com/pyeve/cerberus/pull/425

Dockerfile

@@ -3,7 +3,7 @@ FROM funkyfuture/nest-of-serpents
 ENTRYPOINT tox
 WORKDIR /src
 
-RUN pip3.6 install black flake8 pre-commit pytest tox PyYAML Sphinx \
+RUN pip3.7 install black flake8 pre-commit pytest tox PyYAML Sphinx \
  && mkdir /home/tox \
  && mv /root/.cache /home/tox/
 

cerberus/platform.py

@@ -12,3 +12,29 @@
 else:
     _str_type = str
     _int_types = (int,)
+
+
+if PYTHON_VERSION < 3.3:
+    from collections import (  # noqa: F401
+        Callable,
+        Container,
+        Hashable,
+        Iterable,
+        Mapping,
+        MutableMapping,
+        Sequence,
+        Set,
+        Sized,
+    )
+else:
+    from collections.abc import (  # noqa: F401
+        Callable,
+        Container,
+        Hashable,
+        Iterable,
+        Mapping,
+        MutableMapping,
+        Sequence,
+        Set,
+        Sized,
+    )

cerberus/schema.py

@@ -1,6 +1,5 @@
 from __future__ import absolute_import
 
-from collections import Callable, Hashable, Mapping, MutableMapping, Sequence
 from copy import copy
 from warnings import warn
 
@@ -12,6 +11,7 @@
     mapping_hash,
     TypeDefinition,
 )
+from cerberus.platform import Callable, Hashable, Mapping, MutableMapping, Sequence
 
 
 class _Abort(Exception):

cerberus/utils.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import
 
-from collections import Mapping, namedtuple, Sequence, Set
+from collections import namedtuple
 
-from cerberus.platform import _int_types, _str_type
+from cerberus.platform import _int_types, _str_type, Mapping, Sequence, Set
 
 
 TypeDefinition = namedtuple('TypeDefinition', 'name,included_types,excluded_types')

cerberus/validator.py

@@ -11,14 +11,22 @@
 from __future__ import absolute_import
 
 from ast import literal_eval
-from collections import Container, Hashable, Iterable, Mapping, Sequence, Sized
 from copy import copy
 from datetime import date, datetime
 import re
 from warnings import warn
 
 from cerberus import errors
-from cerberus.platform import _int_types, _str_type
+from cerberus.platform import (
+    _int_types,
+    _str_type,
+    Container,
+    Hashable,
+    Iterable,
+    Mapping,
+    Sequence,
+    Sized,
+)
 from cerberus.schema import (
     schema_registry,
     rules_set_registry,
@@ -27,7 +35,6 @@
 )
 from cerberus.utils import drop_item_from_tuple, readonly_classproperty, TypeDefinition
 
-
 toy_error_handler = errors.ToyErrorHandler()
 
 

setup.py

@@ -46,6 +46,7 @@
         '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',
     ],

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist=py27,py34,py35,py36,pypy,pypy3,doclinks,doctest,linting
+envlist=py27,py34,py35,py36,py37,pypy,pypy3,doclinks,doctest,linting
 
 [testenv]
 deps=pytest
@@ -20,7 +20,6 @@ commands=make doctest
 
 [testenv:linting]
 skipsdist=True
-basepython=python3.6
 deps=pre-commit
 commands=pre-commit run --config .linting-config.yaml --all-files
 
@@ -32,6 +31,7 @@ ignore=E203,W503
 2.7 = py27
 3.4 = py34
 3.5 = py35
-3.6 = py36,doclinks,doctest,linting
+3.6 = py36
+3.7 = py37,doclinks,doctest,linting
 pypy = pypy
 pypy3 = pypy3