Merge "fix dependency path and requirement to enable tox"

controllerconfig/controllerconfig/test-requirements.txt

@@ -1,4 +1,4 @@
-pylint
+pylint <=1.9.3;python_version<'3.0' 
 pytest
 mock
 coverage>=3.6
@@ -6,4 +6,3 @@ PyYAML>=3.10.0 # MIT
 os-testr>=0.8.0 # Apache-2.0
 testresources>=0.2.4 # Apache-2.0/BSD
 testrepository>=0.0.18 # Apache-2.0/BSD
-

controllerconfig/controllerconfig/tox.ini

@@ -7,7 +7,7 @@
 envlist = flake8, py27, pylint
 # Tox does not work if the path to the workdir is too long, so move it to /tmp
 toxworkdir = /tmp/{env:USER}_cctox
-wrsdir = {toxinidir}/../../../../../../..
+wrsdir = {toxinidir}/../../../..
 stxdir = {[tox]wrsdir}/stx
 
 [testenv]
@@ -24,7 +24,6 @@ deps = -r{toxinidir}/requirements.txt
 [testenv:pylint]
 basepython = python2.7
 deps = {[testenv]deps}
-        pylint
 commands = pylint {posargs} controllerconfig --rcfile=./pylint.rc --extension-pkg-whitelist=netifaces
 
 [testenv:flake8]