diff --git a/.coverage b/.coverage index 206ed31a..1eb6ab9c 100644 Binary files a/.coverage and b/.coverage differ diff --git a/mopidy_iris/system.py b/mopidy_iris/system.py index a3809712..868e3016 100755 --- a/mopidy_iris/system.py +++ b/mopidy_iris/system.py @@ -17,9 +17,8 @@ class IrisSystemPermissionError(IrisSystemError): def __init__(self, path): message = ( - r"""Password-less access to %s was refused. - Check your /etc/sudoers file.""" - % path.as_uri() + "Password-less access to %s was refused. " + "Check your /etc/sudoers file." % path.as_uri() ) logger.error(message) super().__init__(message) @@ -61,7 +60,7 @@ class IrisSystemThread(Thread): except IrisSystemError as e: logger.error(e) - error = {"message": e.reason, "description": e.message} + error = {"message": e.reason, "description": str(e)} return {"error": error} diff --git a/setup.cfg b/setup.cfg index e1e52069..9cfe14d3 100755 --- a/setup.cfg +++ b/setup.cfg @@ -83,16 +83,16 @@ ignore = # B305: .next() is not a thing on Python 3 (used by playback controller) B305 exclude = - .circleci, - .git, - .tox, - .vscode, - docs, - tests, - src, - node_modules, - build_tools, - docker, + .circleci + .git + .tox + .vscode + docs + tests + src + node_modules + build_tools + docker Screenshots [check-manifest] @@ -103,6 +103,8 @@ ignore = docker/* Screenshots Screenshots/* + node_modules + node_modules/* src src/* .circleci @@ -111,4 +113,24 @@ ignore = .htaccess .vscode .vscode/* + .dockerignore + +[tool:pytest] +norecursedirs = + build_tools + build_tools/* + docker + docker/* + Screenshots + Screenshots/* + src + src/* + node_modules + node_modules/* + .circleci + .circleci/* + .dockerignore + .htaccess + .vscode + .vscode/* .dockerignore \ No newline at end of file diff --git a/tox.ini b/tox.ini index 0652ae21..db319b31 100755 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] -envlist = py37, py38, black, check-manifest, flake8 +envlist = py37 +#envlist = py37, py38, black, check-manifest, flake8 [testenv] sitepackages = true @@ -17,22 +18,6 @@ commands = python -m black --check . [testenv:check-manifest] deps = .[lint] commands = python -m check_manifest -ignore = - build_tools - build_tools/* - docker - docker/* - Screenshots - Screenshots/* - src - src/* - .circleci - .circleci/* - .dockerignore - .htaccess - .vscode - .vscode/* - .dockerignore [testenv:flake8] deps = .[lint]