Skip to content

Commit 2545141

Browse files
committed
Upgrade version of pytest
1 parent 0988fba commit 2545141

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ env:
2525
install:
2626
- if [[ "$TEST_SOCKETCAN" ]]; then sudo bash test/open_vcan.sh ; fi
2727
- travis_retry pip install .[test]
28+
- pip freeze
2829

2930
script:
3031
- |

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
from __future__ import absolute_import
99

10+
import platform
1011
from os import listdir
1112
from os.path import isfile, join
1213
import re
@@ -31,7 +32,7 @@
3132

3233
tests_require = [
3334
'mock~=2.0',
34-
'pytest~=4.3',
35+
'pytest~=4.6',
3536
'pytest-timeout~=1.3',
3637
'pytest-cov~=2.8',
3738
# coveragepy==5.0 fails with `Safety level may not be changed inside a transaction`
@@ -53,7 +54,6 @@
5354
needs_pytest = {"pytest", "test", "ptr"}.intersection(sys.argv)
5455
pytest_runner = ["pytest-runner"] if needs_pytest else []
5556

56-
5757
setup(
5858
# Description
5959
name="python-can",

0 commit comments

Comments
 (0)