Skip to content

Commit

Permalink
Fix Travis Build Errors
Browse files Browse the repository at this point in the history
* Fix Travis Build Errors

* Convert napalm_base to napalm
  • Loading branch information
javeedf authored and skg-net committed Aug 14, 2018
1 parent 6bc8270 commit 437fca1
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 13 deletions.
5 changes: 4 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@

import uuid

from pip.req import parse_requirements
try: # for pip >= 10
from pip._internal.req import parse_requirements
except ImportError: # for pip <= 9.0.3
from pip.req import parse_requirements

from setuptools import find_packages, setup

Expand Down
10 changes: 5 additions & 5 deletions test/unit/TestDellos10Driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
import unittest
from unittest import SkipTest

from napalm_base.test import models
from napalm_base.test.base import TestConfigNetworkDriver
from napalm_base.test.base import TestGettersNetworkDriver
from napalm_base.test.double import BaseTestDouble
from napalm_base.utils import py23_compat
from napalm.base.test import models
from napalm.base.test.base import TestConfigNetworkDriver
from napalm.base.test.base import TestGettersNetworkDriver
from napalm.base.test.double import BaseTestDouble
from napalm.base.utils import py23_compat

from napalm_dellos10 import dellos10

Expand Down
6 changes: 3 additions & 3 deletions test/unit/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

from builtins import super

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 import conftest as parent_conftest
from napalm.base.test.double import BaseTestDouble
from napalm.base.utils import py23_compat

from napalm_dellos10 import dellos10

Expand Down
8 changes: 4 additions & 4 deletions test/unit/test_getters.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import pytest

from napalm_base.test.getters import BaseTestGetters
from napalm_base.test.getters import wrap_test_cases
from napalm_base.test import helpers
from napalm_base.test import models
from napalm.base.test.getters import BaseTestGetters
from napalm.base.test.getters import wrap_test_cases
from napalm.base.test import helpers
from napalm.base.test import models


@pytest.mark.usefixtures("set_device_parameters")
Expand Down

0 comments on commit 437fca1

Please sign in to comment.