kopia lustrzana https://github.com/NanoVNA-Saver/nanovna-saver
fix: fixed crash in About's update check (#766)
rodzic
ea1d20e3b8
commit
1d54d74d9a
|
@ -26,9 +26,10 @@ from urllib import error, request
|
|||
from PyQt6 import QtCore, QtGui, QtWidgets
|
||||
|
||||
from NanoVNASaver.About import INFO_URL, LATEST_URL, TAGS_KEY, TAGS_URL
|
||||
from ..utils import Version
|
||||
from NanoVNASaver.Windows.Defaults import make_scrollable
|
||||
|
||||
from ..utils import Version
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
|
@ -111,7 +112,9 @@ class AboutWindow(QtWidgets.QWidget):
|
|||
lower_layout.addStretch()
|
||||
|
||||
btn_ok = QtWidgets.QPushButton("Ok")
|
||||
btn_ok.clicked.connect(lambda: self.close())
|
||||
btn_ok.clicked.connect(
|
||||
lambda: self.close()
|
||||
) # pylint disable=unnecessary-lambda
|
||||
lower_layout.addWidget(btn_ok)
|
||||
|
||||
def show(self):
|
||||
|
@ -172,7 +175,7 @@ class AboutWindow(QtWidgets.QWidget):
|
|||
|
||||
if found_latest_version:
|
||||
logger.info("Latest version is %s", latest_version)
|
||||
this_version = Version(self.app.version)
|
||||
this_version = Version.parse(self.app.version)
|
||||
logger.info("This is %s", this_version)
|
||||
if latest_version > this_version:
|
||||
logger.info("New update available: %s!", latest_version)
|
||||
|
@ -211,5 +214,5 @@ class AboutWindow(QtWidgets.QWidget):
|
|||
self.updateLabel.setText(
|
||||
"ERROR - Unable to determine what the latest version is!"
|
||||
)
|
||||
logger.error(f"Can't find {TAGS_KEY} in {TAGS_URL} content.")
|
||||
logger.error("Can't find %s in %s content.", TAGS_KEY, TAGS_URL)
|
||||
return
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
from NanoVNASaver.Hardware.LiteVNA64 import ScreenshotData
|
||||
|
||||
VALID_HEADER = b'\xe0\x01@\x01\x10'
|
||||
VALID_HEADER = b"\xe0\x01@\x01\x10"
|
||||
|
||||
|
||||
class TestScreenshotData:
|
||||
|
||||
|
@ -16,13 +16,15 @@ class TestScreenshotData:
|
|||
|
||||
@staticmethod
|
||||
def test_data_size() -> None:
|
||||
assert ScreenshotData(0,0,0).data_size() == 0
|
||||
assert ScreenshotData(480,320,16).data_size() == 307200
|
||||
assert ScreenshotData(0, 0, 0).data_size() == 0
|
||||
assert ScreenshotData(480, 320, 16).data_size() == 307200
|
||||
|
||||
@staticmethod
|
||||
def test_repr() -> None:
|
||||
assert f"{ScreenshotData(0,0,0)}" == "0x0 0bits (0 Bytes)"
|
||||
assert f"{ScreenshotData(480,320,16)}" == "480x320 16bits (307200 Bytes)"
|
||||
assert f"{ScreenshotData(0,0,0)}" == "0x0 0bits (0 Bytes)"
|
||||
assert (
|
||||
f"{ScreenshotData(480,320,16)}" == "480x320 16bits (307200 Bytes)"
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def test_rgb565_to_888() -> None:
|
||||
|
@ -37,5 +39,5 @@ class TestScreenshotData:
|
|||
|
||||
result = img.get_rgb888_data()
|
||||
|
||||
assert len(result) == 3 *3
|
||||
assert result == b'\x00\x00\x00\xFF\xFF\x00\xFF\xFF\xFF'
|
||||
assert len(result) == 3 * 3
|
||||
assert result == b"\x00\x00\x00\xFF\xFF\x00\xFF\xFF\xFF"
|
||||
|
|
4
uv.lock
4
uv.lock
|
@ -273,7 +273,7 @@ wheels = [
|
|||
|
||||
[[package]]
|
||||
name = "nanovnasaver"
|
||||
version = "0.6.8.post1.dev2+g588c854.d20250114"
|
||||
version = "0.6.8.post1.dev9+g504e64f.d20250121"
|
||||
source = { editable = "." }
|
||||
dependencies = [
|
||||
{ name = "numpy" },
|
||||
|
@ -556,6 +556,8 @@ name = "pyqt6-qt6"
|
|||
version = "6.8.1"
|
||||
source = { registry = "https://pypi.org/simple" }
|
||||
wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/1d/19/b89eb6cecbdf1e65a44658a083693a967e9d428370026711b624e928a8ca/PyQt6_Qt6-6.8.1-1-py3-none-manylinux_2_28_x86_64.whl", hash = "sha256:2f4b8b55b1414b93f340f22e8c88d25550efcdebc4b65a3927dd947b73bd4358", size = 80877444 },
|
||||
{ url = "https://files.pythonhosted.org/packages/87/1b/94d3710ee7ef93ee99c1dac512f631de5e310f6b21e43f474ef269f840b6/PyQt6_Qt6-6.8.1-1-py3-none-manylinux_2_39_aarch64.whl", hash = "sha256:98aa99fe38ae68c5318284cd28f3479ba538c40bf6ece293980abae0925c1b24", size = 79473622 },
|
||||
{ url = "https://files.pythonhosted.org/packages/df/0a/c47a1cc272b418faff8af79b121f0cecd32b09d634253254e3a990432220/PyQt6_Qt6-6.8.1-py3-none-macosx_10_14_x86_64.whl", hash = "sha256:1eb8460a1fdb38d0b2458c2974c01d471c1e59e4eb19ea63fc447aaba3ad530e", size = 65754939 },
|
||||
{ url = "https://files.pythonhosted.org/packages/b1/e6/cc4fbc97a7d0955185e33add3ce00480f0023424d17ac6f864a504f60251/PyQt6_Qt6-6.8.1-py3-none-macosx_11_0_arm64.whl", hash = "sha256:9f3790c4ce4dc576e48b8718d55fb8743057e6cbd53a6ca1dd253ffbac9b7287", size = 59956028 },
|
||||
{ url = "https://files.pythonhosted.org/packages/01/22/c2997fe76d765d9ba960e9a099238cb419a316362bdde50fedacc23e7c7d/PyQt6_Qt6-6.8.1-py3-none-manylinux_2_28_x86_64.whl", hash = "sha256:d6ca5d2b9d2ec0ee4a814b2175f641a5c4299cb80b45e0f5f8356632663f89b3", size = 72561636 },
|
||||
|
|
Ładowanie…
Reference in New Issue