2 files changed, 6 insertions, 8 deletions
diff --git a/setup.py b/setup.py
index ac6ba21fb..a92c19221 100755
--- a/setup.py
+++ b/setup.py
@@ -22,13 +22,11 @@
 import os
 from pathlib import Path
 import re
-import shutil
-import subprocess
 import sys
 
 # Add local directory to the path, in order to be able to import versioneer
 sys.path.append(os.path.dirname(__file__))
-import versioneer  # noqa
+import versioneer  # pylint: disable=wrong-import-position
 
 
 ##################################################################
@@ -168,7 +166,7 @@ class BuildGRPC(Command):
         except ImportError:
             print("BuildStream requires grpc_tools in order to build gRPC modules.\n"
                   "Install it via pip (pip3 install grpcio-tools).")
-            exit(1)
+            sys.exit(1)
 
         protos_root = 'src/buildstream/_protos'
 
diff --git a/tox.ini b/tox.ini
index e481a18c1..83499b006 100644
--- a/tox.ini
+++ b/tox.ini
@@ -87,18 +87,18 @@ whitelist_externals =
 # Environment for native windows
 #
 [testenv:win32]
-commands = 
+commands =
     bst help
     cmd /C md testdir
     bst init testdir --project-name="test"
-deps = 
+deps =
     -rrequirements/requirements.txt
     -rrequirements/dev-requirements.txt
     colorama
     windows-curses
     cython
     .
-whitelist_externals = 
+whitelist_externals =
     bst
     cmd
 
@@ -147,7 +147,7 @@ commands_pre =
     {envpython} setup.py build_ext --inplace
 
 commands =
-    pylint {posargs: src tests doc/source/conf.py}
+    pylint {posargs: src tests doc/source/conf.py setup.py}
 deps =
     -rrequirements/requirements.txt
     -rrequirements/dev-requirements.txt