From 5fde2f4d037ffc080007d7b98008677dcd2b8da1 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 5 Dec 2024 13:40:33 +0100 Subject: [PATCH] replace deprecated pkg_resources.get_distribution() from setuptools This should fix the CI error for macOS and reduce technical debt. https://gitlab.com/fdroid/fdroidserver/-/jobs/8542884186 --- tests/test_common.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/test_common.py b/tests/test_common.py index 5ad5a771..4ae55c73 100755 --- a/tests/test_common.py +++ b/tests/test_common.py @@ -2394,11 +2394,9 @@ class CommonTest(unittest.TestCase): def test_auto_install_ndk_mock_dl(self): """Test NDK installs by actually calling sdkmanager""" import sdkmanager - import pkg_resources + import importlib.metadata - sdkmanager_version = LooseVersion( - pkg_resources.get_distribution('sdkmanager').version - ) + sdkmanager_version = LooseVersion(importlib.metadata.version('sdkmanager')) if sdkmanager_version < LooseVersion('0.6.4'): raise unittest.SkipTest('needs fdroid sdkmanager >= 0.6.4')