summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Devaev <[email protected]>2024-05-13 17:52:04 +0300
committerMaxim Devaev <[email protected]>2024-07-19 15:25:14 +0300
commit89eb04c14106f6826d85a1e6aa37cb17f5d515ee (patch)
treec1df2a26b13892fa28660c17627ecae5474a23f4
parent6facfbbff9f2a5f76a19b07142a449b01d215452 (diff)
lint fixes
-rw-r--r--kvmd/tools.py3
-rwxr-xr-xsetup.py2
-rw-r--r--testenv/tests/test_aiotools.py2
-rw-r--r--testenv/tests/validators/test_basic.py8
-rw-r--r--testenv/tests/validators/test_hw.py8
-rw-r--r--testenv/tests/validators/test_kvm.py14
-rw-r--r--testenv/tests/validators/test_net.py2
-rw-r--r--testenv/tests/validators/test_os.py2
-rw-r--r--testenv/tests/validators/test_ugpio.py2
-rw-r--r--testenv/tox.ini4
10 files changed, 23 insertions, 24 deletions
diff --git a/kvmd/tools.py b/kvmd/tools.py
index fca68e22..c96ff38f 100644
--- a/kvmd/tools.py
+++ b/kvmd/tools.py
@@ -26,7 +26,6 @@ import multiprocessing.queues
import queue
import shlex
-from typing import Hashable
from typing import TypeVar
@@ -45,7 +44,7 @@ def efmt(err: Exception) -> str:
# =====
-def rget(dct: dict, *keys: Hashable) -> dict:
+def rget(dct: dict, *keys: str) -> dict:
result = functools.reduce((lambda nxt, key: nxt.get(key, {})), keys, dct)
if not isinstance(result, dict):
raise TypeError(f"Not a dict as result: {result!r} from {dct!r} at {list(keys)}")
diff --git a/setup.py b/setup.py
index a918aa27..5fd7c32e 100755
--- a/setup.py
+++ b/setup.py
@@ -138,7 +138,7 @@ def main() -> None:
classifiers=[
"License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
"Development Status :: 5 - Production/Stable",
- "Programming Language :: Python :: 3.11",
+ "Programming Language :: Python :: 3.12",
"Topic :: System :: Systems Administration",
"Operating System :: POSIX :: Linux",
"Intended Audience :: System Administrators",
diff --git a/testenv/tests/test_aiotools.py b/testenv/tests/test_aiotools.py
index 8c4f65a4..048b1f9c 100644
--- a/testenv/tests/test_aiotools.py
+++ b/testenv/tests/test_aiotools.py
@@ -111,7 +111,7 @@ async def test_fail__region__access_two() -> None:
results = await asyncio.gather(func1(), func2(), return_exceptions=True)
assert results[0] is None
- assert type(results[1]) == RegionIsBusyError # pylint: disable=unidiomatic-typecheck
+ assert type(results[1]) is RegionIsBusyError # pylint: disable=unidiomatic-typecheck
assert not region.is_busy()
await region.exit()
diff --git a/testenv/tests/validators/test_basic.py b/testenv/tests/validators/test_basic.py
index 06d6deec..7551e4bb 100644
--- a/testenv/tests/validators/test_basic.py
+++ b/testenv/tests/validators/test_basic.py
@@ -86,7 +86,7 @@ def test_fail__valid_number__min_max(arg: Any) -> None: # pylint: disable=inval
@pytest.mark.parametrize("arg", [0, 1, 5, "5 "])
def test_ok__valid_int_f0(arg: Any) -> None:
value = valid_int_f0(arg)
- assert type(value) == int # pylint: disable=unidiomatic-typecheck
+ assert type(value) is int # pylint: disable=unidiomatic-typecheck
assert value == int(str(arg).strip())
@@ -100,7 +100,7 @@ def test_fail__valid_int_f0(arg: Any) -> None:
@pytest.mark.parametrize("arg", [1, 5, "5 "])
def test_ok__valid_int_f1(arg: Any) -> None:
value = valid_int_f1(arg)
- assert type(value) == int # pylint: disable=unidiomatic-typecheck
+ assert type(value) is int # pylint: disable=unidiomatic-typecheck
assert value == int(str(arg).strip())
@@ -114,7 +114,7 @@ def test_fail__valid_int_f1(arg: Any) -> None:
@pytest.mark.parametrize("arg", [0, 1, 5, "5 ", "5.0 "])
def test_ok__valid_float_f0(arg: Any) -> None:
value = valid_float_f0(arg)
- assert type(value) == float # pylint: disable=unidiomatic-typecheck
+ assert type(value) is float # pylint: disable=unidiomatic-typecheck
assert value == float(str(arg).strip())
@@ -128,7 +128,7 @@ def test_fail__valid_float_f0(arg: Any) -> None:
@pytest.mark.parametrize("arg", [0.1, 1, 5, "5 ", "5.0 "])
def test_ok__valid_float_f01(arg: Any) -> None:
value = valid_float_f01(arg)
- assert type(value) == float # pylint: disable=unidiomatic-typecheck
+ assert type(value) is float # pylint: disable=unidiomatic-typecheck
assert value == float(str(arg).strip())
diff --git a/testenv/tests/validators/test_hw.py b/testenv/tests/validators/test_hw.py
index a7a28202..b73af65e 100644
--- a/testenv/tests/validators/test_hw.py
+++ b/testenv/tests/validators/test_hw.py
@@ -37,7 +37,7 @@ from kvmd.validators.hw import valid_otg_ethernet
@pytest.mark.parametrize("arg", ["1200 ", 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200])
def test_ok__valid_tty_speed(arg: Any) -> None:
value = valid_tty_speed(arg)
- assert type(value) == int # pylint: disable=unidiomatic-typecheck
+ assert type(value) is int # pylint: disable=unidiomatic-typecheck
assert value == int(str(arg).strip())
@@ -51,7 +51,7 @@ def test_fail__valid_tty_speed(arg: Any) -> None:
@pytest.mark.parametrize("arg", ["0 ", 0, 1, 13])
def test_ok__valid_gpio_pin(arg: Any) -> None:
value = valid_gpio_pin(arg)
- assert type(value) == int # pylint: disable=unidiomatic-typecheck
+ assert type(value) is int # pylint: disable=unidiomatic-typecheck
assert value == int(str(arg).strip())
@@ -65,7 +65,7 @@ def test_fail__valid_gpio_pin(arg: Any) -> None:
@pytest.mark.parametrize("arg", ["0 ", -1, 0, 1, 13])
def test_ok__valid_gpio_pin_optional(arg: Any) -> None:
value = valid_gpio_pin_optional(arg)
- assert type(value) == int # pylint: disable=unidiomatic-typecheck
+ assert type(value) is int # pylint: disable=unidiomatic-typecheck
assert value == int(str(arg).strip())
@@ -110,7 +110,7 @@ def test_fail__valid_otg_gadget(arg: Any) -> None:
@pytest.mark.parametrize("arg", ["0 ", 0, 1, 13, 65535])
def test_ok__valid_otg_id(arg: Any) -> None:
value = valid_otg_id(arg)
- assert type(value) == int # pylint: disable=unidiomatic-typecheck
+ assert type(value) is int # pylint: disable=unidiomatic-typecheck
assert value == int(str(arg).strip())
diff --git a/testenv/tests/validators/test_kvm.py b/testenv/tests/validators/test_kvm.py
index 9c70c662..b7ea6365 100644
--- a/testenv/tests/validators/test_kvm.py
+++ b/testenv/tests/validators/test_kvm.py
@@ -116,7 +116,7 @@ def test_fail__valid_msd_image_name(arg: Any) -> None:
@pytest.mark.parametrize("arg", [" foo ", "bar", "foo, ,bar,", " ", " , ", ""])
def test_ok__valid_info_fields(arg: Any) -> None:
value = valid_info_fields(arg, set(["foo", "bar"]))
- assert type(value) == set # pylint: disable=unidiomatic-typecheck
+ assert type(value) is set # pylint: disable=unidiomatic-typecheck
assert value == set(filter(None, map(str.strip, str(arg).split(","))))
@@ -130,7 +130,7 @@ def test_fail__valid_info_fields(arg: Any) -> None:
@pytest.mark.parametrize("arg", ["0 ", 0, 1, 13])
def test_ok__valid_log_seek(arg: Any) -> None:
value = valid_log_seek(arg)
- assert type(value) == int # pylint: disable=unidiomatic-typecheck
+ assert type(value) is int # pylint: disable=unidiomatic-typecheck
assert value == int(str(arg).strip())
@@ -144,7 +144,7 @@ def test_fail__valid_log_seek(arg: Any) -> None:
@pytest.mark.parametrize("arg", ["1 ", 20, 100])
def test_ok__valid_stream_quality(arg: Any) -> None:
value = valid_stream_quality(arg)
- assert type(value) == int # pylint: disable=unidiomatic-typecheck
+ assert type(value) is int # pylint: disable=unidiomatic-typecheck
assert value == int(str(arg).strip())
@@ -158,7 +158,7 @@ def test_fail__valid_stream_quality(arg: Any) -> None:
@pytest.mark.parametrize("arg", ["1 ", 120])
def test_ok__valid_stream_fps(arg: Any) -> None:
value = valid_stream_fps(arg)
- assert type(value) == int # pylint: disable=unidiomatic-typecheck
+ assert type(value) is int # pylint: disable=unidiomatic-typecheck
assert value == int(str(arg).strip())
@@ -172,7 +172,7 @@ def test_fail__valid_stream_fps(arg: Any) -> None:
@pytest.mark.parametrize("arg", ["1280x720 ", "1x1"])
def test_ok__valid_stream_resolution(arg: Any) -> None:
value = valid_stream_resolution(arg)
- assert type(value) == str # pylint: disable=unidiomatic-typecheck
+ assert type(value) is str # pylint: disable=unidiomatic-typecheck
assert value == str(arg).strip()
@@ -186,7 +186,7 @@ def test_fail__valid_stream_resolution(arg: Any) -> None:
@pytest.mark.parametrize("arg", ["25", " 20000 ", 5000])
def test_ok__valid_stream_h264_bitrate(arg: Any) -> None:
value = valid_stream_h264_bitrate(arg)
- assert type(value) == int # pylint: disable=unidiomatic-typecheck
+ assert type(value) is int # pylint: disable=unidiomatic-typecheck
assert value == int(str(arg).strip())
@@ -200,7 +200,7 @@ def test_fail__valid_stream_h264_bitrate(arg: Any) -> None:
@pytest.mark.parametrize("arg", ["1 ", 0, 60])
def test_ok__valid_stream_h264_gop(arg: Any) -> None:
value = valid_stream_h264_gop(arg)
- assert type(value) == int # pylint: disable=unidiomatic-typecheck
+ assert type(value) is int # pylint: disable=unidiomatic-typecheck
assert value == int(str(arg).strip())
diff --git a/testenv/tests/validators/test_net.py b/testenv/tests/validators/test_net.py
index 14f2b57c..a67fbeff 100644
--- a/testenv/tests/validators/test_net.py
+++ b/testenv/tests/validators/test_net.py
@@ -147,7 +147,7 @@ def test_fail__valid_rfc_host(arg: Any) -> None:
@pytest.mark.parametrize("arg", ["0 ", 0, "22", 443, 65535])
def test_ok__valid_port(arg: Any) -> None:
value = valid_port(arg)
- assert type(value) == int # pylint: disable=unidiomatic-typecheck
+ assert type(value) is int # pylint: disable=unidiomatic-typecheck
assert value == int(str(arg).strip())
diff --git a/testenv/tests/validators/test_os.py b/testenv/tests/validators/test_os.py
index 30981308..8fb5236b 100644
--- a/testenv/tests/validators/test_os.py
+++ b/testenv/tests/validators/test_os.py
@@ -124,7 +124,7 @@ def test_fail__valid_printable_filename(arg: Any) -> None:
@pytest.mark.parametrize("arg", [0, 5, "1000"])
def test_ok__valid_unix_mode(arg: Any) -> None:
value = valid_unix_mode(arg)
- assert type(value) == int # pylint: disable=unidiomatic-typecheck
+ assert type(value) is int # pylint: disable=unidiomatic-typecheck
assert value == int(str(value).strip())
diff --git a/testenv/tests/validators/test_ugpio.py b/testenv/tests/validators/test_ugpio.py
index 110afd83..be29ea68 100644
--- a/testenv/tests/validators/test_ugpio.py
+++ b/testenv/tests/validators/test_ugpio.py
@@ -72,7 +72,7 @@ def test_fail__valid_ugpio_item(validator: Callable[[Any], str], arg: Any) -> No
@pytest.mark.parametrize("arg", ["foo", " bar", " baz "])
def test_ok__valid_ugpio_driver_variants(arg: Any) -> None:
value = valid_ugpio_driver(arg, set(["foo", "bar", "baz"]))
- assert type(value) == str # pylint: disable=unidiomatic-typecheck
+ assert type(value) is str # pylint: disable=unidiomatic-typecheck
assert value == str(arg).strip()
diff --git a/testenv/tox.ini b/testenv/tox.ini
index c0efad82..2f8c08d0 100644
--- a/testenv/tox.ini
+++ b/testenv/tox.ini
@@ -3,7 +3,7 @@ envlist = flake8, pylint, mypy, vulture, pytest, eslint, htmlhint, shellcheck
skipsdist = true
[testenv]
-basepython = python3.11
+basepython = python3.12
sitepackages = true
changedir = /src
@@ -11,7 +11,7 @@ changedir = /src
allowlist_externals = bash
commands = bash -c 'flake8 --config=testenv/linters/flake8.ini kvmd testenv/tests *.py'
deps =
- flake8==5.0.4
+ flake8
flake8-quotes
-rrequirements.txt