Merge pull request #731 from arcivanov/py_ver_bump_20200609

arcivanov · web-flow · commit b78fe53e4ad4 · 2020-06-10T02:22:29.000-04:00
Bump Python test versions 2020-06-09
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,8 @@ env:
     - PYTHON_VERSION="3.7.7"
     - PYTHON_VERSION="3.6.8"
     - PYTHON_VERSION="3.5.4"
-    - PYTHON_VERSION="3.9.0b1"
+    - PYTHON_VERSION="3.9-dev"
+    - PYTHON_VERSION="3.10-dev"
     - PYTHON_VERSION="pypy3.6-7.3.0"
     - PYTHON_VERSION="pypy2.7-7.3.0"
     - PYTHON_VERSION="pypy3.5-7.0.0"
@@ -39,6 +40,8 @@ jobs:
       env: PYTHON_VERSION="pypy3.5-7.0.0"
     - os: windows
       env: PYTHON_VERSION="pypy3.6-7.3.0"
+    - os: windows
+      if: env(PYTHON_VERSION) =~ /^.+-dev$/
   allow_failures:
     - if: env(PYTHON_VERSION) =~ /^pypy.+$/ or env(PYTHON_VERSION) =~ /[a-z]+/
 
diff --git a/src/main/python/pybuilder/utils.py b/src/main/python/pybuilder/utils.py
@@ -20,7 +20,6 @@
     The PyBuilder utils module.
     Provides generic utilities that can be used by plugins.
 """
-import collections
 import fnmatch
 import json
 import os
@@ -36,6 +35,11 @@
 from pybuilder.python_utils import (is_string, which, makedirs, basestring,
                                     IS_WIN, iglob, escape)
 
+try:
+    from collections import abc
+except ImportError:
+    import collections as abc
+
 
 def get_all_dependencies_for_task(task):
     """
@@ -302,7 +306,7 @@ def mkdir(directory):
 
 def is_notstr_iterable(obj):
     """Checks if obj is iterable, but not a string"""
-    return not isinstance(obj, basestring) and isinstance(obj, collections.Iterable)
+    return not isinstance(obj, basestring) and isinstance(obj, abc.Iterable)
 
 
 def get_dist_version_string(project, format=" (%s)"):
