gluetool 3.0__tar.gz → 3.2__tar.gz

{gluetool-3.0 → gluetool-3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gluetool
-Version: 3.0
+Version: 3.2
 Summary: Python framework for constructing command-line pipelines.
 Home-page: https://gluetool.readthedocs.org/
 License: BSD

{gluetool-3.0 → gluetool-3.2}/gluetool/action.py

@@ -58,9 +58,12 @@ from .log import Logging
 from .result import Result
 
 try:
+    if os.getenv('GLUETOOL_TRACING_DISABLE'):
+        raise ImportError('Tracing is disabled')
+
     import jaeger_client as tracing_client
 
-except ImportError:
+except (ImportError, AttributeError):
     tracing_client = None
 
 # Type annotations

{gluetool-3.0 → gluetool-3.2}/gluetool/glue.py

@@ -12,6 +12,7 @@ import sys
 import configparser
 import io
 
+import importlib.metadata
 import importlib.util
 
 from functools import partial
@@ -20,7 +21,6 @@ from six import iterkeys, itervalues, iteritems, ensure_str, text_type
 
 import jinja2
 import mock
-import pkg_resources
 
 from .action import Action
 from .color import Colors, switch as switch_colors
@@ -2394,13 +2394,14 @@ class Glue(Configurable):
 
         self.debug('discovering modules in entry point {}'.format(entry_point))
 
-        for ep_entry in pkg_resources.iter_entry_points(entry_point):
+        for ep_entry in importlib.metadata.entry_points(group=entry_point):
             klass = ep_entry.load()
 
             assert ep_entry.dist is not None
-            assert ep_entry.dist.location is not None
 
-            self._register_module(registry, getattr(klass, 'group', ''), klass, ep_entry.dist.location)
+            location = str(ep_entry.dist.locate_file(''))
+
+            self._register_module(registry, getattr(klass, 'group', ''), klass, location)
 
     def discover_modules(self,
                          entry_points: Optional[List[str]] = None,

{gluetool-3.0 → gluetool-3.2}/gluetool/tests/test_module_discovery.py

@@ -1,10 +1,11 @@
 # pylint: disable=blacklisted-name
 
+import importlib.metadata
 import logging
+
 import pytest
 
 import gluetool
-import pkg_resources
 
 from mock import MagicMock
 
@@ -74,10 +75,12 @@ def test_register_module_name_conflict(log, glue):
 def test_discover_gm_in_entry(log, monkeypatch, glue):
     registry = {}
 
-    mock_ep = MagicMock(load=MagicMock(return_value=DummyModule), dist=MagicMock(location='dummy-filepath'))
-    mock_iter_entry_points = MagicMock(return_value=[mock_ep])
+    mock_dist = MagicMock()
+    mock_dist.locate_file.return_value = 'dummy-filepath'
+    mock_ep = MagicMock(load=MagicMock(return_value=DummyModule), dist=mock_dist)
+    mock_entry_points = MagicMock(return_value=[mock_ep])
 
-    monkeypatch.setattr(pkg_resources, 'iter_entry_points', mock_iter_entry_points)
+    monkeypatch.setattr(importlib.metadata, 'entry_points', mock_entry_points)
 
     glue._discover_gm_in_entry_point('dummy-entry-point', registry)
 

{gluetool-3.0 → gluetool-3.2}/gluetool/tests/test_tool.py

@@ -7,7 +7,7 @@ import re
 import signal
 import subprocess
 
-import pkg_resources
+import importlib.metadata
 import pytest
 from mock import MagicMock
 
@@ -28,9 +28,9 @@ def test_basic(monkeypatch, tool):
     assert tool.gluetool_config_paths == gluetool.tool.DEFAULT_GLUETOOL_CONFIG_PATHS
 
     monkeypatch.setattr(
-        pkg_resources,
-        'get_distribution',
-        MagicMock(return_value=MagicMock(version='some-version')),
+        importlib.metadata,
+        'version',
+        MagicMock(return_value='some-version'),
     )
     assert tool._version == 'some-version'
 

gluetool-3.2/gluetool/version.py

@@ -0,0 +1,7 @@
+from importlib.metadata import version, PackageNotFoundError
+
+try:
+    __version__ = version('gluetool')
+
+except PackageNotFoundError:
+    pass

{gluetool-3.0 → gluetool-3.2}/pyproject.toml

@@ -4,7 +4,7 @@ dynamic = ["version"]
 
 [tool.poetry]
 name = "gluetool"
-version = "3.0"
+version = "3.2"
 description = "Python framework for constructing command-line pipelines."
 authors = [
   "Milos Prchlik <mprchlik@redhat.com>",

gluetool-3.0/gluetool/version.py

@@ -1,7 +0,0 @@
-from pkg_resources import get_distribution, DistributionNotFound
-
-try:
-    __version__ = get_distribution('gluetool').version
-
-except DistributionNotFound:
-    pass