Merge branch 'develop' into dependabot/pip/types-six-1.17.0.20250515

Author: ktbyers

napalm/__init__.py

@@ -1,4 +1,4 @@
-import pkg_resources
+from importlib.metadata import version, PackageNotFoundError
 import sys
 import logging
 
@@ -23,8 +23,8 @@
     raise RuntimeError("NAPALM requires Python 3.7 or greater")
 
 try:
-    __version__ = pkg_resources.get_distribution("napalm").version
-except pkg_resources.DistributionNotFound:
+    __version__ = version("napalm")
+except PackageNotFoundError:
     __version__ = "Not installed"
 
 __all__ = ("get_network_driver", "SUPPORTED_DRIVERS")

napalm/base/clitools/cl_napalm.py

@@ -7,7 +7,8 @@
 import logging
 import argparse
 import getpass
-import pkg_resources
+import pkgutil
+from importlib.metadata import version
 from functools import wraps
 
 
@@ -156,9 +157,9 @@ def check_installed_packages():
     logger.debug("Gathering napalm packages")
     napalm_packages = sorted(
         [
-            "{}=={}".format(i.key, i.version)
-            for i in pkg_resources.working_set
-            if i.key.startswith("napalm")
+            "{}=={}".format(i.name, version(i.name))
+            for i in list(pkgutil.iter_modules())
+            if i.name.startswith("napalm")
         ]
     )
     for n in napalm_packages:

napalm/base/test/getters.py

@@ -90,7 +90,7 @@ def mock_wrapper(cls, test_case):
             attr.current_test = ""  # Empty them to avoid side effects
             attr.current_test_case = ""  # Empty them to avoid side effects
 
-        return result
+        return None
 
     @functools.wraps(func)
     def real_wrapper(cls, test_case):

napalm/iosxr/__init__.py

@@ -15,15 +15,7 @@
 
 """napalm.iosxr package."""
 
-# Import stdlib
-import pkg_resources
-
 # Import local modules
 from napalm.iosxr.iosxr import IOSXRDriver  # noqa
 
 __all__ = ("IOSXRDriver",)
-
-try:
-    __version__ = pkg_resources.get_distribution("napalm-iosxr").version
-except pkg_resources.DistributionNotFound:
-    __version__ = "Not installed"

napalm/iosxr_netconf/__init__.py

@@ -15,15 +15,7 @@
 
 """napalm.iosxr_netconf package."""
 
-# Import stdlib
-import pkg_resources
-
 # Import local modules
 from napalm.iosxr_netconf.iosxr_netconf import IOSXRNETCONFDriver  # noqa
 
 __all__ = ("IOSXRNETCONFDriver",)
-
-try:
-    __version__ = pkg_resources.get_distribution("napalm-iosxr-netconf").version
-except pkg_resources.DistributionNotFound:
-    __version__ = "Not installed"

napalm/nxos/__init__.py

@@ -15,16 +15,8 @@
 
 """napalm.nxos package."""
 
-# Import stdlib
-import pkg_resources
-
 # Import local modules
 from napalm.nxos.nxos import NXOSDriver
 from napalm.nxos.nxos import NXOSDriverBase
 
-try:
-    __version__ = pkg_resources.get_distribution("napalm-nxos").version
-except pkg_resources.DistributionNotFound:
-    __version__ = "Not installed"
-
 __all__ = ("NXOSDriver", "NXOSDriverBase")

napalm/nxos_ssh/__init__.py

@@ -15,16 +15,7 @@
 
 """napalm.nxos package."""
 
-# Import stdlib
-import pkg_resources
-
 # Import local modules
 from napalm.nxos_ssh.nxos_ssh import NXOSSSHDriver
 
-
-try:
-    __version__ = pkg_resources.get_distribution("napalm-nxos-ssh").version
-except pkg_resources.DistributionNotFound:
-    __version__ = "Not installed"
-
 __all__ = ("NXOSSSHDriver",)

requirements.txt

@@ -8,9 +8,7 @@ netaddr
 pyYAML
 pyeapi>=1.0.2
 netmiko>=4.4.0
-# Temp fix until PyEZ 2.7.4 is released (PY3.13 support)
-git+https://github.com/Juniper/py-junos-eznc.git@39bd1cfb007b6adea654baeaf78a26d1ad35f385
-scp
+junos-eznc>=2.7.4
 lxml>=4.3.0
 ncclient
 ttp

setup.cfg

@@ -27,8 +27,6 @@ python_files =
     test_*.py
     *_test.py
     tests.py
-json_report = report.json
-jsonapi = true
 
 [coverage:run]
 include =