Merge pull request #188 from GuillaumeFavelier/maint_pytest_5.4.0

Update to pytest 5.4.0 API

.travis.yml

@@ -16,15 +16,16 @@ matrix:
       python: 3.4
     - env: TOXENV=py35-pytest39-supported-xdist
       python: 3.5
-    - env: TOXENV=py36-pytest40-supported-xdist
+    - env: TOXENV=py36-pytest40-supported-xdist-pinned-attrs
       python: 3.6
 
-    - env: TOXENV=py37-pytest41-supported-xdist
-    - env: TOXENV=py37-pytest42-supported-xdist
-    - env: TOXENV=py37-pytest42-unsupported-xdist-rerunfailures
+    - env: TOXENV=py37-pytest41-supported-xdist-pinned-attrs
+    - env: TOXENV=py37-pytest42-supported-xdist-pinned-attrs
+    - env: TOXENV=py37-pytest42-unsupported-xdist-rerunfailures-pinned-attrs
+    - env: TOXENV=py37-pytest46-supported-xdist
 
     # Latest pytest.
-    - env: TOXENV=py37-pytest46-supported-xdist
+    - env: TOXENV=py37-pytest54-supported-xdist
 
     - env: TOXENV=qa
 install: pip install -U tox

pytest_sugar.py

@@ -211,7 +211,6 @@ def pytest_report_teststatus(report):
 class SugarTerminalReporter(TerminalReporter):
     def __init__(self, reporter):
         TerminalReporter.__init__(self, reporter.config)
-        self.writer = self._tw
         self.paths_left = []
         self.tests_count = 0
         self.tests_taken = 0
@@ -339,14 +338,14 @@ def get_progress_bar():
     def overwrite(self, line, rel_line_num):
         # Move cursor up rel_line_num lines
         if rel_line_num > 0:
-            self.writer.write("\033[%dA" % rel_line_num)
+            self.write("\033[%dA" % rel_line_num)
 
         # Overwrite the line
-        self.writer.write("\r%s" % line)
+        self.write("\r%s" % line)
 
         # Return cursor to original line
         if rel_line_num > 0:
-            self.writer.write("\033[%dB" % rel_line_num)
+            self.write("\033[%dB" % rel_line_num)
 
     def get_max_column_for_test_status(self):
         return (
@@ -389,7 +388,7 @@ def begin_new_line(self, report, print_filename):
         else:
             self.current_lines[path] = " " * (2 + len(fspath))
         self.current_line_nums[path] = self.current_line_num
-        self.writer.write("\r\n")
+        self.write("\r\n")
 
     def reached_last_column_for_test_status(self, report):
         len_line = real_string_length(

test_sugar.py

@@ -547,7 +547,7 @@ def doctest(self):
                     \"\"\"
             """
         )
-        result = testdir.runpytest('--force-sugar', '--doctest-module')
+        result = testdir.runpytest('--force-sugar', '--doctest-modules')
 
         assert result.ret == 1, result.stderr.str()
 
@@ -567,7 +567,7 @@ def foobar():
                 raise NotImplementedError
             """
         )
-        result = testdir.runpytest('--force-sugar', '--doctest-module')
+        result = testdir.runpytest('--force-sugar', '--doctest-modules')
 
         assert result.ret == 1, result.stderr.str()
         result.stdout.fnmatch_lines([

tox.ini

@@ -17,10 +17,12 @@ deps =
     pytest44: pytest>=4.4,<4.5
     pytest45: pytest>=4.5,<4.6
     pytest46: pytest>=4.6,<4.7
+    pytest54: pytest>=5.4,<5.5
     termcolor>=1.1.0
     supported-xdist: pytest-xdist{env:_TOX_SUGAR_XDIST_VERSION:>=1.14}
     unsupported-xdist: pytest-xdist<1.14
     rerunfailures: pytest-rerunfailures
+    pinned-attrs: attrs<19.2
 setenv =
     # pytest-xdist >= 1.28 requires pytest 4.4
     pytest{36,37,38,39,310,40,41,42,43}: _TOX_SUGAR_XDIST_VERSION=>=1.14,<1.28