Orange/util: Replace use of pkg_resources

Author: ales-erjavec

Orange/tests/test_third_party.py

@@ -1,11 +1,11 @@
 from unittest import TestCase
 
-from pkg_resources import parse_version
+from packaging.version import Version
 
 
 class TestPkgResources(TestCase):
     def test_parse_version(self):
-        self.assertGreater(parse_version('3.4.1'), parse_version('3.4.0'))
-        self.assertGreater(parse_version('3.4.1'), parse_version('3.4.dev'))
-        self.assertGreater(parse_version('3.4.1'), parse_version('3.4.1.dev'))
-        self.assertLess(parse_version('3.4.1'), parse_version('3.4.2.dev'))
+        self.assertGreater(Version('3.4.1'), Version('3.4.0'))
+        self.assertGreater(Version('3.4.1'), Version('3.4.dev'))
+        self.assertGreater(Version('3.4.1'), Version('3.4.1.dev'))
+        self.assertLess(Version('3.4.1'), Version('3.4.2.dev'))

Orange/util.py

@@ -4,10 +4,11 @@
 import inspect
 import datetime
 import math
+import importlib.resources
 from contextlib import contextmanager
-from typing import TYPE_CHECKING, Callable
+from importlib.metadata import distribution
 
-import pkg_resources
+from typing import TYPE_CHECKING, Callable
 from enum import Enum as _Enum
 from functools import wraps, partial
 from operator import attrgetter
@@ -112,20 +113,18 @@ def resource_filename(path):
     """
     Return the resource filename path relative to the Orange package.
     """
-    return pkg_resources.resource_filename("Orange", path)
+    path = importlib.resources.files("Orange").joinpath(path)
+    return str(path)
 
 
 def get_entry_point(dist, group, name):
     """
     Load and return the entry point from the distribution.
-
-    Unlike `pkg_resources.load_entry_point`, this function does not check
-    for requirements. Calling this function is preferred because of developers
-    who experiment with different versions and have inconsistent configurations.
     """
-    dist = pkg_resources.get_distribution(dist)
-    ep = dist.get_entry_info(group, name)
-    return ep.resolve()
+    dist = distribution(dist)
+    eps = dist.entry_points.select(group=group, name=name)
+    ep = next(iter(eps))
+    return ep.load()
 
 
 def deprecated(obj):