From 5529c44efafbd2d218e436bb5fcd2310cab41cce Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 22 Nov 2019 06:00:19 +0100 Subject: [PATCH 1/3] tests: skip test_pytest_html if not installed This is for convenience, and it being tested on CI should be covered via coverage etc. --- tests/test_general.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_general.py b/tests/test_general.py index 1209a83..731eaba 100644 --- a/tests/test_general.py +++ b/tests/test_general.py @@ -205,6 +205,7 @@ def test_3(): ['--tests-per-worker=2'] ]) def test_pytest_html(testdir, cli_args): + pytest.importorskip("pytest_html") report = testdir.tmpdir.join('report.html') testdir.makepyfile(""" def test_1(): From 8ed06ab41c069eb53ff83ed670a8c1b406748801 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 22 Nov 2019 22:00:28 +0100 Subject: [PATCH 2/3] TEST: no pytest-html --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index a96912c..9c11341 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,6 @@ envlist = [testenv] deps = pytest>=3.0 - pytest-html>=1.19.0 six>=1.11.0 tblib coverage: pytest-cov From 460df7af845e0a44830f42d08ef936bdabd7fd72 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 22 Nov 2019 22:39:53 +0100 Subject: [PATCH 3/3] TEST: move codecov.yml --- .ci/codecov.yml => .codecov.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .ci/codecov.yml => .codecov.yml (100%) diff --git a/.ci/codecov.yml b/.codecov.yml similarity index 100% rename from .ci/codecov.yml rename to .codecov.yml