diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b7cdeb5..aa73838 100644 --- a/.github/workflows/ci.yml +++ b/.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 diff --git a/docs/release-notes-1.0.0.rst b/docs/release-notes-1.0.0.rst index 136222d..717b93e 100644 --- a/docs/release-notes-1.0.0.rst +++ b/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 ^^^^^^^^^^^ diff --git a/test/lib/testlib.py b/test/lib/testlib.py index 989fb4d..e6cf159 100644 --- a/test/lib/testlib.py +++ b/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 diff --git a/test/system/test_client.py b/test/system/test_client.py index 63d840c..896b01a 100644 --- a/test/system/test_client.py +++ b/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 diff --git a/test/unit/test_client.py b/test/unit/test_client.py index d094905..3472951 100644 --- a/test/unit/test_client.py +++ b/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 diff --git a/test/unit/test_eapilib.py b/test/unit/test_eapilib.py index 1bafef8..2bc7baf 100644 --- a/test/unit/test_eapilib.py +++ b/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 diff --git a/test/unit/test_utils.py b/test/unit/test_utils.py index 907b48c..a41a7b1 100644 --- a/test/unit/test_utils.py +++ b/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):