From 109c17c5df14874774d163503b50699f57f747b6 Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Thu, 16 Feb 2017 10:44:08 -0800 Subject: [PATCH] Some minor constants cleanup --- pre_commit/constants.py | 7 +++++++ pre_commit/main.py | 7 ++----- pre_commit/repository.py | 16 ++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pre_commit/constants.py b/pre_commit/constants.py index 29ad6a03..387bcd69 100644 --- a/pre_commit/constants.py +++ b/pre_commit/constants.py @@ -1,5 +1,6 @@ from __future__ import unicode_literals +import pkg_resources CONFIG_FILE = '.pre-commit-config.yaml' @@ -13,3 +14,9 @@ YAML_DUMP_KWARGS = { 'encoding': None, 'indent': 4, } + +# Bump when installation changes in a backwards / forwards incompatible way +INSTALLED_STATE_VERSION = '1' + +VERSION = pkg_resources.get_distribution('pre-commit').version +VERSION_PARSED = pkg_resources.parse_version(VERSION) diff --git a/pre_commit/main.py b/pre_commit/main.py index 4108843f..5fb261c0 100644 --- a/pre_commit/main.py +++ b/pre_commit/main.py @@ -4,8 +4,7 @@ import argparse import os import sys -import pkg_resources - +import pre_commit.constants as C from pre_commit import color from pre_commit import five from pre_commit import git @@ -51,9 +50,7 @@ def main(argv=None): parser.add_argument( '-V', '--version', action='version', - version='%(prog)s {}'.format( - pkg_resources.get_distribution('pre-commit').version - ) + version='%(prog)s {}'.format(C.VERSION), ) subparsers = parser.add_subparsers(dest='command') diff --git a/pre_commit/repository.py b/pre_commit/repository.py index c5091683..c53494a4 100644 --- a/pre_commit/repository.py +++ b/pre_commit/repository.py @@ -10,6 +10,7 @@ from collections import defaultdict import pkg_resources from cached_property import cached_property +import pre_commit.constants as C from pre_commit import five from pre_commit import git from pre_commit.clientlib.validate_config import is_local_hooks @@ -23,20 +24,15 @@ from pre_commit.prefixed_command_runner import PrefixedCommandRunner logger = logging.getLogger('pre_commit') -_pre_commit_version = pkg_resources.parse_version( - pkg_resources.get_distribution('pre-commit').version -) - -# Bump when installation changes in a backwards / forwards incompatible way -INSTALLED_STATE_VERSION = '1' - def _state(additional_deps): return {'additional_dependencies': sorted(additional_deps)} def _state_filename(cmd_runner, venv): - return cmd_runner.path(venv, '.install_state_v' + INSTALLED_STATE_VERSION) + return cmd_runner.path( + venv, '.install_state_v' + C.INSTALLED_STATE_VERSION, + ) def _read_installed_state(cmd_runner, venv): @@ -140,12 +136,12 @@ class Repository(object): hook_version = pkg_resources.parse_version( self.manifest.hooks[hook['id']]['minimum_pre_commit_version'], ) - if hook_version > _pre_commit_version: + if hook_version > C.VERSION_PARSED: logger.error( 'The hook `{}` requires pre-commit version {} but ' 'version {} is installed. ' 'Perhaps run `pip install --upgrade pre-commit`.'.format( - hook['id'], hook_version, _pre_commit_version, + hook['id'], hook_version, C.VERSION_PARSED, ) ) exit(1)