4 files changed, 14 insertions, 13 deletions
diff --git a/scripts/compose_functions b/scripts/compose_functions
index 14dd96572..c4ae173e4 100644
--- a/scripts/compose_functions
+++ b/scripts/compose_functions
@@ -42,7 +42,7 @@ export PKI_DOGTAG_DIR
 PKI_REDHAT_DIR="${PKI_DIR}/redhat"
 export PKI_REDHAT_DIR
 
-PKI_FILE_LIST="CMakeLists.txt COPYING CPackConfig.cmake ConfigureChecks.cmake DefineOptions.cmake README cmake_uninstall.cmake.in config.h.cmake pylint-build-scan.sh dogtag.pylintrc"
+PKI_FILE_LIST="CMakeLists.txt COPYING CPackConfig.cmake ConfigureChecks.cmake DefineOptions.cmake README cmake_uninstall.cmake.in config.h.cmake scripts/pylint-build-scan.py scripts/dogtag.pylintrc"
 export PKI_FILE_LIST
 
 PKI_CMAKE_DIR="cmake"
diff --git a/dogtag.pylintrc b/scripts/dogtag.pylintrc
index 3ffb1ab71..3ffb1ab71 100644
--- a/dogtag.pylintrc
+++ b/scripts/dogtag.pylintrc
diff --git a/setup.py b/setup.py
index e14c7f8d4..3b808a384 100644
--- a/setup.py
+++ b/setup.py
@@ -19,15 +19,17 @@
 #
 
 import os
-from fnmatch import fnmatch
+import re
 from distutils.core import setup
 
 
+UPGRADE_SCRIPT = re.compile('^[0-9]+-.*')
+
 def find_upgrade(origroot, destroot):
     upgrades = {}
     for dirpath, dirnames, filenames in os.walk(origroot):
         for filename in filenames:
-            if fnmatch(filename, '[0-9][0-9]-*'):
+            if UPGRADE_SCRIPT.match(filename):
                 version = os.path.basename(dirpath)
                 orig = os.path.join(dirpath, filename)
                 dest = os.path.join(destroot, version)
diff --git a/tox.ini b/tox.ini
index 54ff3b873..85a7f9b00 100644
--- a/tox.ini
+++ b/tox.ini
@@ -44,16 +44,15 @@ sitepackages = True
 deps =
     pylint
 commands =
-    pylint \
-        {envsitepackagesdir}/pki \
-        {envbindir}/pkidestroy \
-        {envbindir}/pkispawn \
-        {envbindir}/pki-server \
-        {envbindir}/pki-server-upgrade \
-        {envbindir}/pki-upgrade \
-        {envbindir}/pki \
-        --rcfile={toxinidir}/dogtag.pylintrc \
-        {posargs}
+    {envpython} {toxinidir}/scripts/pylint-build-scan.py tox
+
+[testenv:lint3k]
+basepython = python2.7
+sitepackages = True
+deps =
+    pylint
+commands =
+    {envpython} {toxinidir}/scripts/pylint-build-scan.py tox -- --py3k
 
 [testenv:pep8]
 basepython = python2.7