Merge pull request #36 from napalm-automation-community/develop

Release 5.1.0

Author: bewing

.github/workflows/commit.yaml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

napalm_mos/__init__.py

@@ -13,12 +13,9 @@
 # the License.
 
 """napalm-mos package."""
-import pkg_resources
+from importlib.metadata import version
 from napalm_mos.mos import MOSDriver
 
-try:
-    __version__ = pkg_resources.get_distribution("napalm-mos").version
-except pkg_resources.DistributionNotFound:
-    __version__ = "Not installed"
+__version__ = version("napalm-mos")
 
 __all__ = ["MOSDriver"]

napalm_mos/mos.py

@@ -34,7 +34,7 @@
 import inspect
 
 from datetime import timedelta, datetime
-from distutils.version import LooseVersion
+from packaging.version import Version
 from ipaddress import IPv4Network
 
 from pyeapi.client import Node as EapiNode
@@ -92,7 +92,7 @@ def __init__(self, hostname, username, password, timeout=60, optional_args=None)
         self._current_config = None
         self._replace_config = False
         self._ssh = None
-        self._version = LooseVersion("0")
+        self._version = Version("0")
 
         self.platform = "mos"
 
@@ -126,7 +126,7 @@ def _run_translated_commands(self, commands, **kwargs):
         In 0.22.0+ some commands had their syntax change.  This function translates those command
         syntaxs to their post 0.22.0 version
         """
-        if self._version >= LooseVersion("0.22.0"):
+        if self._version >= Version("0.22.0"):
             # Map of translate command syntax to 0.23.0+ syntax
             translations = {
                 "show snmp chassis-id": "show snmp v2-mib chassis-id",
@@ -155,11 +155,11 @@ def open(self):
             sw_version = self.device.run_commands(["show version"])[0].get(
                 "softwareImageVersion", "0.0.0"
             )
-            if LooseVersion(sw_version) < LooseVersion("0.17.9"):
+            if Version(sw_version) < Version("0.17.9"):
                 raise NotImplementedError(
                     "MOS Software Version 0.17.9 or better required"
                 )
-            self._version = LooseVersion(sw_version)
+            self._version = Version(sw_version)
         except ConnectionError as ce:
             raise ConnectionException(ce.message)
 
@@ -264,7 +264,7 @@ def _load_config(self, filename=None, config=None, replace=False):
             self._candidate.append("end")
         if any(
             "source mac" in line for line in self._candidate
-        ) and self._version < LooseVersion("0.19.2"):
+        ) and self._version < Version("0.19.2"):
             # Waiting for fixed release
             raise CommandErrorException(
                 "Cannot set source mac in MOS versions prior to 0.19.2"

requirements.txt

@@ -1 +1,2 @@
-napalm>=5.0.0
+napalm>=5.1.0
+packaging>=25.0

setup.cfg

@@ -12,8 +12,5 @@ json_report = report.json
 jsonapi = true
 
 [coverage:run]
-include = 
-	napalm_mos/*
 
 [easy_install]
-

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name="napalm-mos",
-    version="5.0.0",
+    version="5.1.0",
     packages=find_packages(),
     author="Benny Holmgren, Brandon Ewing",
     author_email="benny@holmgren.id.au, brandon.ewing@warningg.com",
@@ -23,5 +23,5 @@
     url="https://github.com/napalm-automation-community/napalm-mos",
     include_package_data=True,
     install_requires=reqs,
-    python_requires=">=3.8",
+    python_requires=">=3.9",
 )