Upgrade version of pytest

hardbyte · Aug 6, 2020 · 2545141 · 2545141
1 parent 0988fba
commit 2545141
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,6 +25,7 @@ env:
 install:
   - if [[ "$TEST_SOCKETCAN" ]]; then sudo bash test/open_vcan.sh ; fi
   - travis_retry pip install .[test]
+  - pip freeze
 
 script:
   - |

diff --git a/setup.py b/setup.py
@@ -7,6 +7,7 @@
 
 from __future__ import absolute_import
 
+import platform
 from os import listdir
 from os.path import isfile, join
 import re
@@ -31,7 +32,7 @@
 
 tests_require = [
     'mock~=2.0',
-    'pytest~=4.3',
+    'pytest~=4.6',
     'pytest-timeout~=1.3',
     'pytest-cov~=2.8',
     # coveragepy==5.0 fails with `Safety level may not be changed inside a transaction`
@@ -53,7 +54,6 @@
 needs_pytest = {"pytest", "test", "ptr"}.intersection(sys.argv)
 pytest_runner = ["pytest-runner"] if needs_pytest else []
 
-
 setup(
     # Description
     name="python-can",