From b9bcbbc7bca214d9c40c3e9262387c3d0be08cff Mon Sep 17 00:00:00 2001 From: Thom Seddon Date: Thu, 22 Feb 2018 10:16:54 +0000 Subject: [PATCH 1/3] Use napalm instead of napalm_base --- napalm_vyos/vyos.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/napalm_vyos/vyos.py b/napalm_vyos/vyos.py index dd98e86..20aee55 100644 --- a/napalm_vyos/vyos.py +++ b/napalm_vyos/vyos.py @@ -30,10 +30,10 @@ from netmiko import ConnectHandler from netmiko import SCPConn # NAPALM base -import napalm_base.constants as C -from napalm_base.utils import py23_compat -from napalm_base.base import NetworkDriver -from napalm_base.exceptions import ConnectionException, \ +import napalm.base.constants as C +from napalm.base.utils import py23_compat +from napalm.base.base import NetworkDriver +from napalm.base.exceptions import ConnectionException, \ MergeConfigException, ReplaceConfigException From 69c8c6665219813d0aa15249fb19e2188477606a Mon Sep 17 00:00:00 2001 From: Pieprzycki Piotr Date: Thu, 22 Feb 2018 20:00:24 +0100 Subject: [PATCH 2/3] napalm 2 --- napalm_vyos/vyos.py | 8 ++++---- requirements.txt | 2 +- test/unit/TestVyOSDriver.py | 2 +- test/unit/conftest.py | 6 +++--- test/unit/test_getters.py | 2 +- tox.ini | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/napalm_vyos/vyos.py b/napalm_vyos/vyos.py index dd98e86..20aee55 100644 --- a/napalm_vyos/vyos.py +++ b/napalm_vyos/vyos.py @@ -30,10 +30,10 @@ from netmiko import ConnectHandler from netmiko import SCPConn # NAPALM base -import napalm_base.constants as C -from napalm_base.utils import py23_compat -from napalm_base.base import NetworkDriver -from napalm_base.exceptions import ConnectionException, \ +import napalm.base.constants as C +from napalm.base.utils import py23_compat +from napalm.base.base import NetworkDriver +from napalm.base.exceptions import ConnectionException, \ MergeConfigException, ReplaceConfigException diff --git a/requirements.txt b/requirements.txt index 07e7ced..50c91a5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -napalm_base +napalm==2.* paramiko netmiko>=1.1.0 vyattaconfparser diff --git a/test/unit/TestVyOSDriver.py b/test/unit/TestVyOSDriver.py index cde1693..434092c 100644 --- a/test/unit/TestVyOSDriver.py +++ b/test/unit/TestVyOSDriver.py @@ -15,7 +15,7 @@ import unittest from napalm_vyos import vyos -from napalm_base.test.base import TestConfigNetworkDriver +from napalm.base.test.base import TestConfigNetworkDriver class TestConfigVyOSDriver(unittest.TestCase, TestConfigNetworkDriver): diff --git a/test/unit/conftest.py b/test/unit/conftest.py index c69c044..c9ed747 100644 --- a/test/unit/conftest.py +++ b/test/unit/conftest.py @@ -2,10 +2,10 @@ from builtins import super import pytest -from napalm_base.test import conftest as parent_conftest +from napalm.base.test import conftest as parent_conftest -from napalm_base.test.double import BaseTestDouble -from napalm_base.utils import py23_compat +from napalm.base.test.double import BaseTestDouble +from napalm.base.utils import py23_compat from napalm_vyos import vyos diff --git a/test/unit/test_getters.py b/test/unit/test_getters.py index 6509001..4e4cb4e 100644 --- a/test/unit/test_getters.py +++ b/test/unit/test_getters.py @@ -1,6 +1,6 @@ """Tests for getters.""" -from napalm_base.test.getters import BaseTestGetters +from napalm.base.test.getters import BaseTestGetters import pytest diff --git a/tox.ini b/tox.ini index 5ae5d81..9a30816 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,py34,py35 +envlist = py27,py35 [testenv] deps = From 4d5221686607d407a7d612f4f8b50a3d1911c744 Mon Sep 17 00:00:00 2001 From: Pieprzycki Piotr Date: Thu, 22 Feb 2018 20:28:24 +0100 Subject: [PATCH 3/3] Fix travis status and set new version 0.1.4 --- README.md | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a95df0f..967ba27 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![PyPI](https://img.shields.io/pypi/v/napalm-vyos.svg)](https://pypi.python.org/pypi/napalm-vyos) [![PyPI](https://img.shields.io/pypi/dm/napalm-vyos.svg)](https://pypi.python.org/pypi/napalm-vyos) -[![Build Status](https://travis-ci.org/napalm-automation/napalm-vyos.svg?branch=master)](https://travis-ci.org/napalm-automation/napalm-vyos) +[![Build Status](https://travis-ci.org/napalm-automation-community/napalm-vyos.svg?branch=master)](https://travis-ci.org/napalm-automation-community/napalm-vyos) # napalm-vyos diff --git a/setup.py b/setup.py index 75910c9..363bcb2 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ reqs = [str(ir.req) for ir in install_reqs] setup( name="napalm-vyos", - version="0.1.3", + version="0.1.4", packages=find_packages(), author="Piotr Pieprzycki", author_email="piotr.pieprzycki@dreamlab.pl",