Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

preparing for uplifting pyeapi in EOS #272

Merged
merged 3 commits into from
Jun 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/release-notes-1.0.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
^^^^^^^^^^^
Expand Down
2 changes: 1 addition & 1 deletion test/lib/testlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion test/system/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/unit/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion test/unit/test_eapilib.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import unittest
import json

from mock import Mock, patch
from unittest.mock import Mock, patch

import pyeapi.eapilib

Expand Down
8 changes: 2 additions & 6 deletions test/unit/test_utils.py
Original file line number Diff line number Diff line change
@@ -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):

Expand Down