Merge pull request #272 from dlyssenko/fix_mock_failures

preparing for uplifting pyeapi in EOS

.github/workflows/ci.yml

@@ -10,9 +10,9 @@ jobs:
       fail-fast: false
     name: Test on Python ${{ matrix.python-version }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install wheel

docs/release-notes-1.0.0.rst

@@ -4,7 +4,7 @@ Release 1.0.0
 2023-06-06
 
 - This is a Python3 (3.7 onwards) release only (Python2 is no longer supported)
-- Arista EOS 4.22 or later required
+- Arista EOS 4.22 or later required (for on-box use cases only)
 
 New Modules
 ^^^^^^^^^^^

test/lib/testlib.py

@@ -34,7 +34,7 @@
 import string
 import unittest
 
-from mock import MagicMock as Mock
+from unittest.mock import MagicMock as Mock
 
 from pyeapi.client import Node
 

test/system/test_client.py

@@ -37,7 +37,7 @@
 sys.path.append(os.path.join(os.path.dirname(__file__), '../lib'))
 
 from testlib import random_int, random_string, get_fixture
-from mock import patch
+from unittest.mock import patch
 
 import pyeapi.client
 import pyeapi.eapilib

test/unit/test_client.py

@@ -36,7 +36,7 @@
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '../lib'))
 
-from mock import Mock, patch, call
+from unittest.mock import Mock, patch, call
 
 from testlib import get_fixture, random_string, random_int
 

test/unit/test_eapilib.py

@@ -1,7 +1,7 @@
 import unittest
 import json
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 import pyeapi.eapilib
 

test/unit/test_utils.py

@@ -1,13 +1,9 @@
-import sys
 import unittest
 
-from mock import patch, Mock
+from unittest.mock import patch, Mock
 import pyeapi.utils
 
-if sys.version_info < (3, 3):
-    from collections import Iterable
-else:
-    from collections.abc import Iterable
+from collections.abc import Iterable
 
 class TestUtils(unittest.TestCase):