test: update tox and fix py3 failures

scanny · scanny · commit 2d6c91318926 · 2018-12-27T21:53:42.000-08:00
* Sequence is now in `collections.abc` and will be removed from
  `collections` in 3.8.
* zip() returns an iterator in Python 3 and must be wrapped with
  something like list() or tuple() to be realized.
* Remove support for 2.6.
* Add tox tests for 3.6 and 3.7.
* Update .travis.yml to match tox versions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,10 @@
 language: python
 python:
-  - "3.6"
-  - "3.5"
   - "2.7"
-  - "2.6"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "3.7"
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install: pip install -r requirements.txt
 # command to run tests, e.g. python setup.py test
diff --git a/docx/bookmark.py b/docx/bookmark.py
@@ -6,9 +6,9 @@
     absolute_import, division, print_function, unicode_literals
 )
 
-from collections import Sequence
 from itertools import chain
 
+from docx.compat import Sequence
 from docx.oxml.ns import qn
 from docx.shared import lazyproperty
 
diff --git a/docx/compat.py b/docx/compat.py
@@ -14,6 +14,11 @@
 # Python 3 versions
 # ===========================================================================
 
+if sys.version_info >= (3, 3):
+    from collections.abc import Sequence
+else:
+    from collections import Sequence  # noqa
+
 if sys.version_info >= (3, 0):
 
     from io import BytesIO
diff --git a/docx/section.py b/docx/section.py
@@ -6,7 +6,7 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
-from collections import Sequence
+from docx.compat import Sequence
 
 
 class Sections(Sequence):
diff --git a/tests/test_bookmark.py b/tests/test_bookmark.py
@@ -35,7 +35,7 @@ def it_provides_access_to_bookmarks_by_index(
         bookmarkStarts = tuple(element("w:bookmarkStart") for _ in range(3))
         bookmarkEnds = tuple(element("w:bookmarkEnd") for _ in range(3))
         _finder_prop_.return_value = finder_
-        finder_.bookmark_pairs = zip(bookmarkStarts, bookmarkEnds)
+        finder_.bookmark_pairs = list(zip(bookmarkStarts, bookmarkEnds))
         _Bookmark_.return_value = bookmark_
         bookmarks = Bookmarks(None)
 
@@ -50,7 +50,7 @@ def it_provides_access_to_bookmarks_by_slice(
         bookmarkStarts = tuple(element("w:bookmarkStart") for _ in range(4))
         bookmarkEnds = tuple(element("w:bookmarkEnd") for _ in range(4))
         _finder_prop_.return_value = finder_
-        finder_.bookmark_pairs = zip(bookmarkStarts, bookmarkEnds)
+        finder_.bookmark_pairs = list(zip(bookmarkStarts, bookmarkEnds))
         _Bookmark_.return_value = bookmark_
         bookmarks = Bookmarks(None)
 
@@ -68,7 +68,7 @@ def it_can_iterate_its_bookmarks(
         bookmarkStarts = tuple(element("w:bookmarkStart") for _ in range(3))
         bookmarkEnds = tuple(element("w:bookmarkEnd") for _ in range(3))
         _finder_prop_.return_value = finder_
-        finder_.bookmark_pairs = zip(bookmarkStarts, bookmarkEnds)
+        finder_.bookmark_pairs = list(zip(bookmarkStarts, bookmarkEnds))
         _Bookmark_.return_value = bookmark_
         bookmarks = Bookmarks(None)
 
diff --git a/tests/unitutil/mock.py b/tests/unitutil/mock.py
@@ -10,7 +10,7 @@
 
 if sys.version_info >= (3, 3):
     from unittest import mock  # noqa
-    from unittest.mock import call, MagicMock  # noqa
+    from unittest.mock import ANY, call, MagicMock  # noqa
     from unittest.mock import create_autospec, Mock, mock_open, patch, PropertyMock
 else:
     import mock  # noqa
diff --git a/tox.ini b/tox.ini
@@ -15,9 +15,9 @@ python_functions = it_ they_ but_ and_it_
 testpaths = tests
 
 [tox]
-envlist = py26, py27, py33, py34, py35
+envlist = py27, py34, py35, py36, py37
 
-[testenv]
+[testenv:py27]
 deps =
     behave
     lxml
@@ -27,27 +27,15 @@ deps =
 
 commands =
     py.test -qx
-    behave --format progress --stop --tags=-wip
-
-[testenv:py26]
-deps =
-    importlib>=1.0.3
-    behave
-    lxml
-    mock
-    pyparsing
-    pytest
+    behave --format progress
 
-[testenv:py33]
+[testenv]
 deps =
     behave
     lxml
     pyparsing
     pytest
 
-[testenv:py34]
-deps =
-    behave
-    lxml
-    pyparsing
-    pytest
+commands =
+    py.test -qx
+    behave --format progress

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@`
`6`	`6`	`absolute_import, division, print_function, unicode_literals`
`7`	`7`	`)`
`8`	`8`
`9`		`-from collections import Sequence`
`10`	`9`	`from itertools import chain`
`11`	`10`
	`11`	`+from docx.compat import Sequence`
`12`	`12`	`from docx.oxml.ns import qn`
`13`	`13`	`from docx.shared import lazyproperty`
`14`	`14`