third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-02-18 00:24:47 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #490 from pre-commit/some_minor_cleanup

Browse source 
Some minor cleanup
This commit is contained in:
Anthony Sottile 2017-02-16 14:51:43 -05:00 • committed by GitHub
commit 927f471a6c
5 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pre_commit/constants.py
View file

@ -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)

4
pre_commit/envcontext.py
View file

@ -5,14 +5,12 @@ import collections
import contextlib
import os
from pre_commit import five
UNSET = collections.namedtuple('UNSET', ())()
Var = collections.namedtuple('Var', ('name', 'default'))
setattr(Var.__new__, five.defaults_attr, ('',))
setattr(Var.__new__, '__defaults__', ('',))
def format_env(parts, env):

4
pre_commit/five.py
View file

@ -11,8 +11,6 @@ if PY2: # pragma: no cover (PY2 only)
return s
else:
return s.encode('UTF-8')
defaults_attr = 'func_defaults'
else: # pragma: no cover (PY3 only)
text = str
@ -22,8 +20,6 @@ else: # pragma: no cover (PY3 only)
else:
return s.decode('UTF-8')
defaults_attr = '__defaults__'
def to_text(s):
return s if isinstance(s, text) else s.decode('UTF-8')

7
pre_commit/main.py
View file

@ -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')

16
pre_commit/repository.py
View file

@ -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)