Fixed compat dependency

dvershinin · Feb 18, 2022 · 1cd0d3f · 1cd0d3f
1 parent c55a103
commit 1cd0d3f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git 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
@@ -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"(?<!\\)(\.)"
 

diff --git a/setup.py b/setup.py
@@ -14,8 +14,7 @@
 _version_re = re.compile(r"__version__\s=\s'(.*)'")
 
 install_requires = [
-    # collections_abc moves introduced there
-    "six>=1.13.0",
+    "six",
     "pyyaml"
 ]
 tests_requires = [