From 73bc8ad328572cf22b1dcc20ef5baf5e0463351a Mon Sep 17 00:00:00 2001 From: Alexandre 'Kidev' Poumaroux <1204936+Kidev@users.noreply.github.com> Date: Mon, 16 Dec 2024 03:38:11 +0100 Subject: [PATCH] Remove dep on Version in CI --- ci/generate_azure_pipelines_matrices.py | 9 ++++++--- tests/test_list.py | 1 - 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ci/generate_azure_pipelines_matrices.py b/ci/generate_azure_pipelines_matrices.py index d2b76a09..60cc29ae 100644 --- a/ci/generate_azure_pipelines_matrices.py +++ b/ci/generate_azure_pipelines_matrices.py @@ -8,8 +8,6 @@ from itertools import product from typing import Dict, Optional -from semantic_version import Version - MIRRORS = [ "https://ftp.jaist.ac.jp/pub/qtproject", "https://ftp1.nluug.nl/languages/qt", @@ -125,7 +123,12 @@ def emsdk_version_for_qt(version_of_qt: str) -> str: if qt_major_minor in BuildJob.EMSDK_FOR_QT: return BuildJob.EMSDK_FOR_QT[qt_major_minor] - latest_version = max(BuildJob.EMSDK_FOR_QT.keys(), key=Version) + # Find the latest version using string comparison + latest_version = "0.0" + for version in BuildJob.EMSDK_FOR_QT.keys(): + if version > latest_version: + latest_version = version + return BuildJob.EMSDK_FOR_QT[latest_version] diff --git a/tests/test_list.py b/tests/test_list.py index 3dae4724..fa68acab 100644 --- a/tests/test_list.py +++ b/tests/test_list.py @@ -457,7 +457,6 @@ def _mock_fetch_http(_, rest_of_url: str, *args, **kwargs) -> str: return "" # Return empty HTML since we don't need it monkeypatch.setattr("aqt.metadata.getUrl", _mock_fetch_http) - # monkeypatch.setattr("aqt.metadata.fetch_http", _mock_fetch_http) monkeypatch.setattr(MetadataFactory, "fetch_http", _mock_fetch_http) cli = Cli()