diff --git a/sde/__about__.py b/sde/__about__.py index 99d2a6f..6ebd335 100644 --- a/sde/__about__.py +++ b/sde/__about__.py @@ -1 +1 @@ -__version__ = '1.1.5' +__version__ = '1.1.6' diff --git a/sde/collection.py b/sde/collection.py index f23d82c..d9777a0 100644 --- a/sde/collection.py +++ b/sde/collection.py @@ -5,9 +5,16 @@ import sys from abc import ABCMeta, abstractmethod +import six import yaml from six import add_metaclass, string_types as basestring, iteritems -from six.moves import collections_abc +# this was only introduced in six 1.13.0, but it's too old in RHEL, +# and we don't want to rebuild its package +# from six.moves import collections_abc +if six.PY2: + import collections as collections_abc +else: + import collections.abc as collections_abc SPLIT_REGEX = r"(?=1.13.0", + "six", "pyyaml" ] tests_requires = [