Merge pull request #23 from napalm-automation-community/develop

Merge develop branch with master
napalm-automation-community · Feb 22, 2018 · 06f9fc2 · 06f9fc2
2 parents 347d6a6 + 6e68dba
commit 06f9fc2
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git 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/napalm_vyos/vyos.py b/napalm_vyos/vyos.py
@@ -30,10 +30,10 @@
 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
@@ -1,4 +1,4 @@
-napalm_base
+napalm==2.*
 paramiko
 netmiko>=1.1.0
 vyattaconfparser
diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@
 
 setup(
     name="napalm-vyos",
-    version="0.1.3",
+    version="0.1.4",
     packages=find_packages(),
     author="Piotr Pieprzycki",
     author_email="piotr.pieprzycki@dreamlab.pl",

diff --git 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
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34,py35
+envlist = py27,py35
 
 [testenv]
 deps =