Permalink
Browse files

requirements: update pytest and plugins to current versions

Also, adjust functions using get_marker according to
https://docs.pytest.org/en/latest/mark.html#marker-revamp-and-iteration.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
  • Loading branch information...
jluebbe committed Sep 26, 2018
1 parent d7359ee commit 7227925fb3906e19ed9e706a7643e92e7c917900
Showing with 11 additions and 12 deletions.
  1. +8 −9 dev-requirements.txt
  2. +1 −1 labgrid/pytestplugin/hooks.py
  3. +1 −1 requirements.txt
  4. +1 −1 tests/conftest.py
@@ -1,15 +1,14 @@
pytest-cache==1.0
pytest-cov==2.5.1
pytest-isort==0.1.0
pytest-mock==1.6.3
pytest-pylint==0.7.1
pytest-runner==3.0
pytest-dependency==0.3.2
yapf==0.20.1
pytest-cov==2.6.0
pytest-isort==0.2.1
pytest-mock==1.10.0
pytest-pylint==0.13.0
pytest-runner==4.2
pytest-dependency==0.4.0
yapf==0.24.0
-r doc-requirements.txt
-r crossbar-requirements.txt
-r onewire-requirements.txt
-r modbus-requirements.txt
-r snmp-requirements.txt
-r xena-requirements.txt
-r graph-requirements.txt
-r graph-requirements.txt
@@ -57,7 +57,7 @@ def pytest_collection_modifyitems(config, items):
have_feature = env.get_features() | env.get_target_features()

for item in items:
marker = item.get_marker("lg_feature")
marker = item.get_closest_marker("lg_feature")
if not marker:
continue
else:
@@ -2,7 +2,7 @@ attrs==17.4.0
jinja2==2.10
pexpect==4.3.1
https://github.com/labgrid-project/pyserial/archive/v3.4.0.1.zip#egg=pyserial
pytest==3.4.0
pytest==4.0.2
pyudev==0.21.0
requests==2.18.4
xmodem==0.4.5
@@ -97,7 +97,7 @@ def pytest_configure(config):
"localsshmanager: test SSHManager against Localhost")

def pytest_runtest_setup(item):
envmarker = item.get_marker("sigrokusb")
envmarker = item.get_closest_marker("sigrokusb")
if envmarker is not None:
if item.config.getoption("--sigrok-usb") is False:
pytest.skip("sigrok usb tests not enabled (enable with --sigrok-usb)")

0 comments on commit 7227925

Please sign in to comment.