Merge branch 'release/1.3.1'

.travis.yml

@@ -7,6 +7,7 @@ python:
   - 3.5
   - 3.6
   - 3.7
+  - 3.8
   - pypy        # Python 2.7 compatible
   - pypy3.5     # Python 3.5 compatible
   - pypy3       # Python 3.6 compatible

AUTHORS

@@ -1,3 +1,3 @@
-Nick Douma <nick.douma@cyso.nl>
-Niels van Huijstee <niels.vanhuijstee@cyso.nl>
+Nick Douma <n.douma@nekoconeko.nl>
+Niels van Huijstee <niels.vanhuijstee@cyso.com>
 Niels van Huijstee <niels@fuga.cloud>

ChangeLog

@@ -1,6 +1,16 @@
 CHANGES
 =======
 
+* Update ChangeLog
+* Update README
+* Fix Flake8 error
+* Add Python 3.8 to test suite
+* Avoid collections deprecation warning when using abc classes
+
+1.3.0
+-----
+
+* Update ChangeLog and AUTHORS
 * Update README
 * Use yaml full\_load\_all
 * Add string\_bool and string\_or\_false

README.rst

@@ -60,6 +60,7 @@ For an up-to-date changelog, see `ChangeLog`_.
 .. _ChangeLog: ChangeLog
 
 Support for Python 3.3 was dropped in version 1.3.0 .
+Support for Python 3.8 was added in version 1.3.1 .
 
 License
 -------

omniconf/types.py

@@ -16,15 +16,18 @@
 # License along with this library. If not, see
 # <http://www.gnu.org/licenses/>.
 
-import collections
+try:
+    from collections import abc
+except ImportError:  # pragma: nocover
+    import collections as abc
 
 try:
     string_types = (str, unicode)
 except NameError:  # pragma: nocover
     string_types = (str, bytes)
 
 
-class SeparatorSequence(collections.Sequence):
+class SeparatorSequence(abc.Sequence):
     """
     Splits the given string using the given separator, and provides a
     the result with a read-only Sequence interface.
@@ -63,7 +66,7 @@ def separator_sequence(separator):
     and can be used as one would normally use a (read-only) tuple or list.
     """
     def factory(value):
-        if isinstance(value, collections.Sequence) and \
+        if isinstance(value, abc.Sequence) and \
                 not isinstance(value, string_types):
             return value
         return SeparatorSequence(value, separator)

setup.cfg

@@ -22,6 +22,7 @@ classifier =
     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 :: Jython
     Programming Language :: Python :: Implementation :: PyPy

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = setup,py27,py33,py34,py35,py36,pypy,jython,coverage,sphinx
+envlist = setup,py27,py34,py35,py36,py37,py38,pypy,jython,coverage,sphinx
 
 [testenv]
 deps =