python3.12 support

.github/workflows/pylint.yml

@@ -13,8 +13,8 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
-        python-version: [3.7, 3.8, 3.9]
+        os: [ubuntu-20.04, windows-latest]
+        python-version: [3.9, '3.10', 3.11, 3.12]
         exclude:
           - os: windows-latest
             python-version: 3.8
@@ -35,6 +35,7 @@ jobs:
         pip install -r development.txt
         pip install ntc_templates==1.4.1
         pip install textfsm==0.4.1
+        pip install nose2
         pip install .
 
     - name: Run black tool
@@ -44,4 +45,7 @@ jobs:
 
     - name: Run unit tests
       run: |
-        nosetests -v --with-coverage --cover-package=jnpr.junos --cover-inclusive -a unit
+        echo $SHELL
+        uname -a
+        lsb_release -a
+        nose2 -vvv tests.unit

lib/jnpr/junos/utils/scp.py

@@ -43,7 +43,7 @@ def __init__(self, junos, **scpargs):
             # User case also define progress with 3 params, the way scp module
             # expects. Function will take path, total size, transferred.
             # https://github.com/jbardin/scp.py/blob/master/scp.py#L97
-            spec = inspect.getargspec(self._user_progress)
+            spec = inspect.getfullargspec(self._user_progress)
             if (len(spec.args) == 3 and spec.args[0] != "self") or (
                 len(spec.args) == 4 and spec.args[0] == "self"
             ):

lib/jnpr/junos/utils/start_shell.py

@@ -119,7 +119,7 @@ def open(self):
                 stdin=subprocess.PIPE,
                 stdout=subprocess.PIPE,
                 close_fds=1,
-                bufsize=1,
+                bufsize=0,
             )
         else:
             self._client = open_ssh_client(dev=self._nc)

requirements.txt

@@ -1,6 +1,6 @@
 lxml>=3.2.4
 # ncclient version 0.6.10 has issues with PyEZ(junos-eznc) and needs to be avoided
-ncclient==0.6.13
+ncclient>=0.6.15
 paramiko>=1.15.2
 scp>=0.7.0
 jinja2>=2.7.1

tests/unit/__init__.py

@@ -1,17 +1,17 @@
 import unittest
 import sys
 
-from nose.plugins.attrib import attr
+import nose2
 from mock import patch
 
 __author__ = "Nitin Kumar"
 __credits__ = "Jeremy Schulman"
 
 
-@attr("unit")
+
 class TestJunosInit(unittest.TestCase):
     def test_warning(self):
-        with patch.object(sys.modules["sys"], "version_info", (2, 6, 3)) as mock_sys:
+        with patch.object(sys.modules["sys"], "version_info", (2, 6, 8)) as mock_sys:
             from jnpr import junos
 
-            self.assertEqual(mock_sys, (2, 6, 3))
+            self.assertEqual(mock_sys, (2, 6, 8))

tests/unit/factory/test_cfgtable.py

@@ -5,7 +5,7 @@
 import os
 import sys
 
-from nose.plugins.attrib import attr
+import nose2
 import yaml
 
 from jnpr.junos import Device
@@ -85,7 +85,7 @@
 globals().update(FactoryLoader().load(yaml.load(yaml_bgp_data, Loader=yaml.FullLoader)))
 
 
-@attr("unit")
+
 @unittest.skipIf(sys.platform == "win32", "will work for windows in coming days")
 class TestFactoryCfgTable(unittest.TestCase):
     @patch("ncclient.manager.connect")

tests/unit/factory/test_cmdtable.py

@@ -3,7 +3,7 @@
 
 import unittest
 import os
-from nose.plugins.attrib import attr
+import nose2
 
 from jnpr.junos import Device
 from jnpr.junos.exception import RpcError
@@ -17,7 +17,7 @@
 import json
 
 
-@attr("unit")
+
 class TestFactoryCMDTable(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

tests/unit/factory/test_factory_cls.py

@@ -2,13 +2,13 @@
 __credits__ = "Jeremy Schulman"
 
 import unittest
-from nose.plugins.attrib import attr
+import nose2
 
 from jnpr.junos.factory.factory_cls import FactoryCfgTable, FactoryOpTable
 from jnpr.junos.factory.factory_cls import FactoryTable, FactoryView
 
 
-@attr("unit")
+
 class TestFactoryCls(unittest.TestCase):
     def test_factory_cls_cfgtable(self):
         t = FactoryCfgTable()

tests/unit/factory/test_factory_loader.py

@@ -2,12 +2,12 @@
 __credits__ = "Jeremy Schulman"
 
 import unittest
-from nose.plugins.attrib import attr
+import nose2
 from jnpr.junos.factory import FactoryLoader
 from mock import patch
 
 
-@attr("unit")
+
 class TestFactoryLoader(unittest.TestCase):
     def setUp(self):
         self.fl = FactoryLoader()

tests/unit/factory/test_optable.py

@@ -5,7 +5,7 @@
 import os
 import yaml
 import json
-from nose.plugins.attrib import attr
+import nose2
 
 from jnpr.junos import Device
 from jnpr.junos.op.phyport import PhyPortStatsTable
@@ -22,7 +22,7 @@
 from mock import patch
 
 
-@attr("unit")
+
 class TestFactoryOpTable(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

tests/unit/factory/test_table.py

@@ -2,7 +2,7 @@
 __credits__ = "Jeremy Schulman"
 
 import unittest
-from nose.plugins.attrib import attr
+import nose2
 import os
 
 from jnpr.junos import Device
@@ -23,7 +23,7 @@
     builtin_string = "builtins"
 
 
-@attr("unit")
+
 class TestFactoryTable(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

tests/unit/factory/test_to_json.py

@@ -4,7 +4,7 @@
     import unittest2 as unittest
 except ImportError:
     import unittest
-from nose.plugins.attrib import attr
+import nose2
 from mock import patch
 import os
 import json
@@ -21,7 +21,7 @@
 from ncclient.operations.rpc import RPCReply
 
 
-@attr("unit")
+
 class TestToJson(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

tests/unit/factory/test_view.py

@@ -2,15 +2,15 @@
 __credits__ = "Jeremy Schulman"
 
 import unittest
-from nose.plugins.attrib import attr
+import nose2
 from mock import MagicMock, patch
 from jnpr.junos import Device
 from jnpr.junos.factory.view import View
 from jnpr.junos.op.phyport import PhyPortStatsTable, PhyPortStatsView
 from lxml import etree
 
 
-@attr("unit")
+
 class TestFactoryView(unittest.TestCase):
     def setUp(self):
         self.dev = Device(

tests/unit/factory/test_view_fields.py

@@ -2,12 +2,12 @@
 __credits__ = "Jeremy Schulman"
 
 import unittest
-from nose.plugins.attrib import attr
+import nose2
 
 from jnpr.junos.factory.viewfields import ViewFields
 
 
-@attr("unit")
+
 class TestFactoryViewFields(unittest.TestCase):
     def setUp(self):
         self.vf = ViewFields()

tests/unit/facts/test__init__.py

@@ -5,14 +5,14 @@
     import unittest2 as unittest
 except ImportError:
     import unittest
-from nose.plugins.attrib import attr
+import nose2
 import importlib
 import sys
 
 import jnpr.junos.facts
 
 
-@attr("unit")
+
 class TestFactInitialization(unittest.TestCase):
     def test_duplicate_facts(self):
         module = importlib.import_module("tests.unit.facts.dupe_foo1")

tests/unit/facts/test_current_re.py

@@ -2,7 +2,7 @@
 __credits__ = "Jeremy Schulman, Nitin Kumar"
 
 import unittest
-from nose.plugins.attrib import attr
+import nose2
 from mock import patch, MagicMock
 import os
 from lxml import etree
@@ -14,7 +14,7 @@
 from ncclient.transport import SSHSession
 
 
-@attr("unit")
+
 class TestCurrentRe(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

tests/unit/facts/test_domain.py

@@ -2,7 +2,7 @@
 __credits__ = "Jeremy Schulman, Nitin Kumar"
 
 import unittest
-from nose.plugins.attrib import attr
+import nose2
 from mock import patch, MagicMock
 import os
 from lxml import etree
@@ -14,7 +14,7 @@
 from ncclient.transport import SSHSession
 
 
-@attr("unit")
+
 class TestDomain(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

tests/unit/facts/test_ethernet_mac_table.py

@@ -2,7 +2,7 @@
 __credits__ = "Jeremy Schulman, Nitin Kumar"
 
 import unittest
-from nose.plugins.attrib import attr
+import nose2
 from mock import patch, MagicMock
 import os
 from lxml import etree
@@ -14,7 +14,7 @@
 from ncclient.transport import SSHSession
 
 
-@attr("unit")
+
 class TestEthernetMacTable(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

tests/unit/facts/test_file_list.py

@@ -2,7 +2,7 @@
 __credits__ = "Jeremy Schulman, Nitin Kumar"
 
 import unittest
-from nose.plugins.attrib import attr
+import nose2
 from mock import patch, MagicMock
 import os
 
@@ -12,7 +12,7 @@
 from ncclient.transport import SSHSession
 
 
-@attr("unit")
+
 class TestFileList(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

tests/unit/facts/test_get_chassis_cluster_status.py

@@ -2,7 +2,7 @@
 __credits__ = "Jeremy Schulman, Nitin Kumar"
 
 import unittest
-from nose.plugins.attrib import attr
+import nose2
 from mock import patch, MagicMock
 import os
 from lxml import etree
@@ -14,7 +14,7 @@
 from ncclient.transport import SSHSession
 
 
-@attr("unit")
+
 class TestGetChassisClusterStatus(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

tests/unit/facts/test_get_chassis_inventory.py

@@ -2,7 +2,7 @@
 __credits__ = "Jeremy Schulman, Nitin Kumar"
 
 import unittest
-from nose.plugins.attrib import attr
+import nose2
 from mock import patch, MagicMock
 import os
 
@@ -12,7 +12,7 @@
 from ncclient.transport import SSHSession
 
 
-@attr("unit")
+
 class TestChassis(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

tests/unit/facts/test_get_route_engine_information.py

@@ -2,7 +2,7 @@
 __credits__ = "Jeremy Schulman, Nitin Kumar"
 
 import unittest
-from nose.plugins.attrib import attr
+import nose2
 from mock import patch, MagicMock
 import os
 from lxml import etree
@@ -13,7 +13,7 @@
 from ncclient.transport import SSHSession
 
 
-@attr("unit")
+
 class TestGetRouteEngineInformation(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

tests/unit/facts/test_get_software_information.py

@@ -2,7 +2,7 @@
 __credits__ = "Jeremy Schulman, Nitin Kumar"
 
 import unittest
-from nose.plugins.attrib import attr
+import nose2
 from mock import patch, MagicMock
 import os
 from lxml import etree
@@ -14,7 +14,7 @@
 from ncclient.transport import SSHSession
 
 
-@attr("unit")
+
 class TestGetSoftwareInformation(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):