From 3502294172d26f513817ea406928ea56754c2032 Mon Sep 17 00:00:00 2001 From: scito Date: Tue, 3 Jan 2023 02:00:07 +0100 Subject: [PATCH] remove dependency to module and fix build script --- build.sh | 2 +- tests/conftest.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index 5cc913c..dc3fe12 100755 --- a/build.sh +++ b/build.sh @@ -317,7 +317,7 @@ eval "$cmd" # Build wheel -cmd="$PIP wheel . +cmd="$PIP wheel ." if $interactive ; then askContinueYn "$cmd"; else echo -e "${cyan}$cmd${reset}";fi eval "$cmd" diff --git a/tests/conftest.py b/tests/conftest.py index 10c03c1..423d112 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -2,8 +2,6 @@ from typing import Any import pytest -from extract_otp_secrets import QRMode - def pytest_addoption(parser: pytest.Parser) -> None: parser.addoption("--relaxed", action='store_true', help="run tests in relaxed mode") @@ -17,6 +15,7 @@ def relaxed(request: pytest.FixtureRequest) -> Any: def pytest_generate_tests(metafunc: pytest.Metafunc) -> None: if "qr_mode" in metafunc.fixturenames: - number = 2 if metafunc.config.getoption("fast") else len(QRMode) - qr_modes = [mode.name for mode in QRMode] + all_qr_modes = ['ZBAR', 'QREADER', 'QREADER_DEEP', 'CV2', 'CV2_WECHAT'] + number = 2 if metafunc.config.getoption("fast") else len(all_qr_modes) + qr_modes = [mode for mode in all_qr_modes] metafunc.parametrize("qr_mode", qr_modes[0:number])