Orange/widgets: Replace use of pkg_resources

Author: ales-erjavec

Orange/widgets/__init__.py

@@ -4,17 +4,16 @@
 import os
 import sysconfig
 
-import pkg_resources
-
 from orangecanvas.registry import CategoryDescription
 from orangecanvas.registry.utils import category_from_package_globals
+from orangecanvas.utils.pkgmeta import get_distribution
 import orangewidget.workflow.discovery
 
 
 # Entry point for main Orange categories/widgets discovery
 def widget_discovery(discovery):
     # type: (orangewidget.workflow.discovery.WidgetDiscovery) -> None
-    dist = pkg_resources.get_distribution("Orange3")
+    dist = get_distribution("Orange3")
     pkgs = [
         "Orange.widgets.data",
         "Orange.widgets.visualize",

Orange/widgets/data/owpreprocess.py

@@ -1,5 +1,5 @@
 from collections import OrderedDict
-import pkg_resources
+import importlib.resources
 
 import numpy
 
@@ -993,7 +993,8 @@ def __init__(self, name, qualname, category, description, viewclass):
 
 
 def icon_path(basename):
-    return pkg_resources.resource_filename(__name__, "icons/" + basename)
+    path = importlib.resources.files(__package__).joinpath("icons/" + basename)
+    return str(path)
 
 
 PREPROCESS_ACTIONS = [

Orange/widgets/evaluate/tests/test_owliftcurve.py

@@ -1,9 +1,10 @@
 # pylint: disable=protected-access,duplicate-code
 import copy
-import pkg_resources
 import unittest
 from unittest.mock import Mock
 
+from packaging.version import Version
+
 import numpy as np
 import sklearn
 
@@ -26,8 +27,7 @@
 # scikit-learn==1.1.1 does not support read the docs, therefore
 # we can not make it a requirement for now. When the minimum required
 # version is >=1.1.1, delete these exceptions.
-OK_SKLEARN = pkg_resources.parse_version(sklearn.__version__) >= \
-             pkg_resources.parse_version("1.1.1")
+OK_SKLEARN = Version(sklearn.__version__) >= Version("1.1.1")
 SKIP_REASON = "Only test precision-recall with scikit-learn>=1.1.1"
 
 

Orange/widgets/tests/test_workflows.py

@@ -2,11 +2,12 @@
 from os import listdir, environ
 from os.path import isfile, join, dirname
 import unittest
-import pkg_resources
+from unittest import mock
 
 from AnyQt.QtTest import QTest
 
 from orangecanvas.registry import WidgetRegistry
+from orangecanvas.config import EntryPoint
 from orangewidget.workflow import widgetsscheme
 
 from Orange.canvas.config import Config
@@ -63,17 +64,17 @@ def test_scheme_examples(self):
                     QTest.qWait(0)
 
     def test_examples_order(self):
-        # register test entrypoints
-        dist_orange = pkg_resources.working_set.by_key['orange3']
-        ep_map = dist_orange.get_entry_map()
-        ep_first = pkg_resources.EntryPoint('!Testname', 'orangecontrib.any_addon.tutorials')
-        ep_last = pkg_resources.EntryPoint('exampletutorials', 'orangecontrib.other_addon.tutorials')
-        ep_map['orange.widgets.tutorials'] = {ep_first.name: ep_first, ep_last.name: ep_last}
+        ep_first = EntryPoint(
+            '!Testname', 'orangecontrib.any_addon.tutorials', '')
+        ep_last = EntryPoint(
+            'exampletutorials', 'orangecontrib.other_addon.tutorials', '')
 
-        ep_names = [point.name for point in Config.examples_entry_points()]
+        def entry_points(*_, **__):
+            return ep_first, ep_last
+
+        with mock.patch("Orange.canvas.config.entry_points", entry_points):
+            ep_names = [point.name for point in Config.examples_entry_points()]
         self.assertLess(ep_names.index(ep_first.name),
                         ep_names.index("000-Orange3"))
         self.assertLess(ep_names.index("000-Orange3"),
                         ep_names.index(ep_last.name))
-
-        del ep_map['orange.widgets.tutorials']