From 1d893598fab6a515b6b1503f6c9259951ba4355d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20HUBSCHER?= <hubscher.remy@gmail.com>
Date: Wed, 7 Nov 2018 10:12:41 +0100
Subject: [PATCH] Fix support for pytest >= 3.10 (#160)

Regards Frozenball/pytest-sugar#133
Fixes Frozenball/pytest-sugar#159
---
 .coveragerc     | 11 +++++++++++
 .gitignore      |  3 ++-
 .travis.yml     |  1 +
 pytest_sugar.py | 16 ++++++++++------
 setup.py        |  2 +-
 tox.ini         |  5 +++--
 6 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 .coveragerc

diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 0000000..3415dd4
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,11 @@
+[run]
+branch = 1
+parallel = 1
+
+[report]
+include = pytest_sugar.py,test_*.py
+
+[paths]
+source = ./
+  .tox/*/lib/python*/site-packages/
+  .tox\*\Lib\site-packages\
diff --git a/.gitignore b/.gitignore
index 75d68bd..8d33849 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@
 .tox
 .cache
 dist/
-build
\ No newline at end of file
+build
+.coverage
diff --git a/.travis.yml b/.travis.yml
index 82e206c..feb9fef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,7 @@ env:
   - TOXENV=py35-pytest34-supported-xdist
   - TOXENV=py36-pytest30-supported-xdist
   - TOXENV=py36-pytest34-supported-xdist
+  - TOXENV=py36-pytest310-supported-xdist-rerunfailures
   - TOXENV=py35-pytest30-unsupported-xdist
   - TOXENV=pypy-pytest30-supported-xdist
   - TOXENV=pypy-pytest31-supported-xdist
diff --git a/pytest_sugar.py b/pytest_sugar.py
index 8f4c8cf..1a9294d 100644
--- a/pytest_sugar.py
+++ b/pytest_sugar.py
@@ -14,6 +14,7 @@
 import os
 import re
 import sys
+from packaging.version import parse
 
 try:
     from configparser import ConfigParser
@@ -398,12 +399,10 @@ def pytest_runtest_logstart(self, nodeid, location):
         # show the module_name & in verbose mode the test name.
         pass
 
-    if pytest.__version__ >= '3.4':
-
-        def pytest_runtest_logfinish(self):
-            # prevent the default implementation to try to show
-            # pytest's default progress
-            pass
+    def pytest_runtest_logfinish(self):
+        # prevent the default implementation to try to show
+        # pytest's default progress
+        pass
 
     def report_key(self, report):
         """Returns a key to identify which line the report should write to."""
@@ -625,3 +624,8 @@ def print_failure(self, report):
                 self.write_sep("―", msg)
                 self._outrep_summary(report)
         self.reset_tracked_lines()
+
+
+# On older version of Pytest, allow default progress
+if parse(pytest.__version__) <= parse('3.4'):  # pragma: no cover
+    del SugarTerminalReporter.pytest_runtest_logfinish
diff --git a/setup.py b/setup.py
index a4d9684..d9cf7ac 100644
--- a/setup.py
+++ b/setup.py
@@ -38,7 +38,7 @@ def get_version(filename):
     zip_safe=False,
     include_package_data=True,
     platforms='any',
-    install_requires=['pytest>=2.9', 'termcolor>=1.1.0'],
+    install_requires=['pytest>=2.9', 'termcolor>=1.1.0', 'packaging>=14.1'],
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Intended Audience :: Developers',
diff --git a/tox.ini b/tox.ini
index dbb282f..f88d4c1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,12 +20,13 @@ deps =
     pytest34: pytest>=3.4,<3.5
     pytest37: pytest>=3.7,<3.8
     pytest39: pytest>=3.9,<3.10
+    pytest310: pytest>=3.10,<3.11
     termcolor>=1.1.0
     supported-xdist: pytest-xdist>=1.14
     unsupported-xdist: pytest-xdist<1.14
-    pytest-rerunfailures
+    rerunfailures: pytest-rerunfailures
 commands =
-    py.test --cov=./ {posargs:test_sugar.py}
+    py.test --cov --cov-config=.coveragerc {posargs:test_sugar.py}
     codecov -e TOXENV
 
 [testenv:qa]