diff options
| -rw-r--r-- | scripts/compose_functions | 2 | ||||
| -rw-r--r-- | scripts/dogtag.pylintrc (renamed from dogtag.pylintrc) | 0 | ||||
| -rwxr-xr-x | scripts/pylint-build-scan.py (renamed from pylint-build-scan.py) | 16 | ||||
| -rw-r--r-- | setup.py | 6 | ||||
| -rw-r--r-- | tox.ini | 4 |
5 files changed, 17 insertions, 11 deletions
diff --git a/scripts/compose_functions b/scripts/compose_functions index c9b0de36a..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.py 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/pylint-build-scan.py b/scripts/pylint-build-scan.py index 9cd8a98c4..be036088f 100755 --- a/pylint-build-scan.py +++ b/scripts/pylint-build-scan.py @@ -23,16 +23,18 @@ from __future__ import print_function, unicode_literals import argparse import os -import fnmatch import pprint +import re import subprocess import sys from distutils.sysconfig import get_python_lib # pylint: disable=F0401 + SCRIPTPATH = os.path.dirname(os.path.abspath(__file__)) +PYLINTRC = os.path.join(SCRIPTPATH, 'dogtag.pylintrc') FILENAMES = [ - '{scriptpath}/pylint-build-scan.py', + os.path.abspath(__file__), '{sitepackages}/pki', '{bin}/pki', '{sbin}/pkispawn', @@ -41,13 +43,13 @@ FILENAMES = [ '{sbin}/pki-server', '{sbin}/pki-server-upgrade', ] +UPGRADE_SCRIPT = re.compile('^[0-9]+-.*') def tox_env(args): """Paths for tox environment""" prefix = args.prefix env = { - 'scriptpath': SCRIPTPATH, 'bin': os.path.join(prefix, 'bin'), 'sbin': os.path.join(prefix, 'bin'), 'sharepki': os.path.join(prefix, 'share', 'pki'), @@ -61,7 +63,6 @@ def rpm_env(args): prefix = args.prefix relative = get_python_lib().lstrip(os.sep) env = { - 'scriptpath': SCRIPTPATH, 'bin': os.path.join(prefix, 'usr', 'bin'), 'sbin': os.path.join(prefix, 'usr', 'sbin'), 'sharepki': os.path.join(prefix, 'usr', 'share', 'pki'), @@ -74,7 +75,7 @@ def find_upgrades(root): """Find upgrade scripts""" for dirpath, _, filenames in os.walk(root): for filename in filenames: - if fnmatch.fnmatch(filename, '[0-9][0-9]-*'): + if UPGRADE_SCRIPT.match(filename): yield os.path.join(dirpath, filename) @@ -113,9 +114,12 @@ def main(): else: extra_args = args.pylint_args + if not os.path.isfile(PYLINTRC): + raise IOError('{} not found'.format(PYLINTRC)) + pylint = [ 'pylint', - '--rcfile={scriptpath}/dogtag.pylintrc'.format(**env) + '--rcfile={}'.format(PYLINTRC) ] pylint.extend(extra_args) pylint.extend(filename.format(**env) for filename in FILENAMES) @@ -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) @@ -44,7 +44,7 @@ sitepackages = True deps = pylint commands = - {envpython} {toxinidir}/pylint-build-scan.py tox + {envpython} {toxinidir}/scripts/pylint-build-scan.py tox [testenv:lint3k] basepython = python2.7 @@ -52,7 +52,7 @@ sitepackages = True deps = pylint commands = - {envpython} {toxinidir}/pylint-build-scan.py tox -- --py3k + {envpython} {toxinidir}/scripts/pylint-build-scan.py tox -- --py3k [testenv:pep8] basepython = python2.7 |