Skip to content

Commit 109c17c

Browse files
committed
Some minor constants cleanup
1 parent b32facc commit 109c17c

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

pre_commit/constants.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from __future__ import unicode_literals
22

3+
import pkg_resources
34

45
CONFIG_FILE = '.pre-commit-config.yaml'
56

@@ -13,3 +14,9 @@
1314
'encoding': None,
1415
'indent': 4,
1516
}
17+
18+
# Bump when installation changes in a backwards / forwards incompatible way
19+
INSTALLED_STATE_VERSION = '1'
20+
21+
VERSION = pkg_resources.get_distribution('pre-commit').version
22+
VERSION_PARSED = pkg_resources.parse_version(VERSION)

pre_commit/main.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
import os
55
import sys
66

7-
import pkg_resources
8-
7+
import pre_commit.constants as C
98
from pre_commit import color
109
from pre_commit import five
1110
from pre_commit import git
@@ -51,9 +50,7 @@ def main(argv=None):
5150
parser.add_argument(
5251
'-V', '--version',
5352
action='version',
54-
version='%(prog)s {}'.format(
55-
pkg_resources.get_distribution('pre-commit').version
56-
)
53+
version='%(prog)s {}'.format(C.VERSION),
5754
)
5855

5956
subparsers = parser.add_subparsers(dest='command')

pre_commit/repository.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import pkg_resources
1111
from cached_property import cached_property
1212

13+
import pre_commit.constants as C
1314
from pre_commit import five
1415
from pre_commit import git
1516
from pre_commit.clientlib.validate_config import is_local_hooks
@@ -23,20 +24,15 @@
2324

2425
logger = logging.getLogger('pre_commit')
2526

26-
_pre_commit_version = pkg_resources.parse_version(
27-
pkg_resources.get_distribution('pre-commit').version
28-
)
29-
30-
# Bump when installation changes in a backwards / forwards incompatible way
31-
INSTALLED_STATE_VERSION = '1'
32-
3327

3428
def _state(additional_deps):
3529
return {'additional_dependencies': sorted(additional_deps)}
3630

3731

3832
def _state_filename(cmd_runner, venv):
39-
return cmd_runner.path(venv, '.install_state_v' + INSTALLED_STATE_VERSION)
33+
return cmd_runner.path(
34+
venv, '.install_state_v' + C.INSTALLED_STATE_VERSION,
35+
)
4036

4137

4238
def _read_installed_state(cmd_runner, venv):
@@ -140,12 +136,12 @@ def hooks(self):
140136
hook_version = pkg_resources.parse_version(
141137
self.manifest.hooks[hook['id']]['minimum_pre_commit_version'],
142138
)
143-
if hook_version > _pre_commit_version:
139+
if hook_version > C.VERSION_PARSED:
144140
logger.error(
145141
'The hook `{}` requires pre-commit version {} but '
146142
'version {} is installed. '
147143
'Perhaps run `pip install --upgrade pre-commit`.'.format(
148-
hook['id'], hook_version, _pre_commit_version,
144+
hook['id'], hook_version, C.VERSION_PARSED,
149145
)
150146
)
151147
exit(1)

0 commit comments

Comments
 (0)