From bcf4bc813886fc05f7989a983137a5b3fb688ecb Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 11 Feb 2020 11:02:32 +0100 Subject: [PATCH 1/3] Simplify _is_any_version_compatible It now literally says: for any version, is it compatible? Contributes to issue CURA-7207. --- .../Toolbox/src/CloudSync/SubscribedPackagesModel.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py b/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py index f29f23b001..8e2b4255f0 100644 --- a/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py +++ b/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py @@ -74,8 +74,9 @@ class SubscribedPackagesModel(ListModel): @staticmethod def _is_any_version_compatible(package_manager: PackageManager, api_versions: [str]) -> bool: - """:return: True when any of the provided api versions is compatible""" - for version in api_versions: - if package_manager.isPackageCompatible(Version(version)): - return True - return False + """ + Check a list of version numbers if any of them applies to our + application. + :return: ``True`` when any of the provided API versions is compatible. + """ + return any(package_manager.isPackageCompatible(Version(version)) for version in api_versions) From 0c42b1fdea9d40c90bafc5875e32d3af1556c9d0 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 11 Feb 2020 11:06:33 +0100 Subject: [PATCH 2/3] Code style: Method names with lower camelcase Contributes to issue CURA-7207. --- plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py b/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py index 8e2b4255f0..53a1b0ee71 100644 --- a/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py +++ b/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py @@ -63,7 +63,7 @@ class SubscribedPackagesModel(ListModel): "is_dismissed": False, } - package.update({"is_compatible": self._is_any_version_compatible(package_manager, item["sdk_versions"])}) + package.update({"is_compatible": self._isAnyVersionCompatible(package_manager, item["sdk_versions"])}) try: package.update({"icon_url": item["icon_url"]}) @@ -73,7 +73,7 @@ class SubscribedPackagesModel(ListModel): self.setItems(self._items) @staticmethod - def _is_any_version_compatible(package_manager: PackageManager, api_versions: [str]) -> bool: + def _isAnyVersionCompatible(package_manager: PackageManager, api_versions: [str]) -> bool: """ Check a list of version numbers if any of them applies to our application. From ea9a9d58b17e93eed22923001069fceafea8a798 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 11 Feb 2020 11:09:02 +0100 Subject: [PATCH 3/3] Fix typing of list of API versions Contributes to issue CURA-7207. --- plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py b/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py index 53a1b0ee71..da15c71fdb 100644 --- a/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py +++ b/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py @@ -73,7 +73,7 @@ class SubscribedPackagesModel(ListModel): self.setItems(self._items) @staticmethod - def _isAnyVersionCompatible(package_manager: PackageManager, api_versions: [str]) -> bool: + def _isAnyVersionCompatible(package_manager: PackageManager, api_versions: List[str]) -> bool: """ Check a list of version numbers if any of them applies to our application.