precommit
diff --git a/‎pre_commit/clientlib.py‎
Lines changed: 42 additions & 50 deletions b/‎pre_commit/clientlib.py‎
Lines changed: 42 additions & 50 deletions
diff --git a/‎pre_commit/commands/autoupdate.py‎
Lines changed: 1 addition & 1 deletion b/‎pre_commit/commands/autoupdate.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎pre_commit/meta_hooks/check_useless_excludes.py‎
Lines changed: 2 additions & 1 deletion b/‎pre_commit/meta_hooks/check_useless_excludes.py‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎pre_commit/repository.py‎
Lines changed: 2 additions & 2 deletions b/‎pre_commit/repository.py‎
Lines changed: 2 additions & 2 deletions
@@ -5,25 +5,18 @@
 import collections
 import functools
 
+import cfgv
 from aspy.yaml import ordered_load
 from identify.identify import ALL_TAGS
 
 import pre_commit.constants as C
-from pre_commit import schema
 from pre_commit.error_handler import FatalError
 from pre_commit.languages.all import all_languages
 
 
-def check_language(v):
-    if v not in all_languages:
-        raise schema.ValidationError(
-            'Expected {} to be in {!r}'.format(v, all_languages),
-        )
-
-
 def check_type_tag(tag):
     if tag not in ALL_TAGS:
-        raise schema.ValidationError(
+        raise cfgv.ValidationError(
             'Type tag {!r} is not recognized.  '
             'Try upgrading identify and pre-commit?'.format(tag),
         )
@@ -36,49 +29,48 @@ def _make_argparser(filenames_help):
     return parser
 
 
-MANIFEST_HOOK_DICT = schema.Map(
+MANIFEST_HOOK_DICT = cfgv.Map(
     'Hook', 'id',
 
-    schema.Required('id', schema.check_string),
-    schema.Required('name', schema.check_string),
-    schema.Required('entry', schema.check_string),
-    schema.Required(
-        'language', schema.check_and(schema.check_string, check_language),
+    cfgv.Required('id', cfgv.check_string),
+    cfgv.Required('name', cfgv.check_string),
+    cfgv.Required('entry', cfgv.check_string),
+    cfgv.Required(
+        'language',
+        cfgv.check_and(cfgv.check_string, cfgv.check_one_of(all_languages)),
     ),
 
-    schema.Optional(
-        'files', schema.check_and(schema.check_string, schema.check_regex),
-        '',
+    cfgv.Optional(
+        'files', cfgv.check_and(cfgv.check_string, cfgv.check_regex), '',
     ),
-    schema.Optional(
-        'exclude', schema.check_and(schema.check_string, schema.check_regex),
-        '^$',
+    cfgv.Optional(
+        'exclude', cfgv.check_and(cfgv.check_string, cfgv.check_regex), '^$',
     ),
-    schema.Optional('types', schema.check_array(check_type_tag), ['file']),
-    schema.Optional('exclude_types', schema.check_array(check_type_tag), []),
+    cfgv.Optional('types', cfgv.check_array(check_type_tag), ['file']),
+    cfgv.Optional('exclude_types', cfgv.check_array(check_type_tag), []),
 
-    schema.Optional(
-        'additional_dependencies', schema.check_array(schema.check_string), [],
+    cfgv.Optional(
+        'additional_dependencies', cfgv.check_array(cfgv.check_string), [],
     ),
-    schema.Optional('args', schema.check_array(schema.check_string), []),
-    schema.Optional('always_run', schema.check_bool, False),
-    schema.Optional('pass_filenames', schema.check_bool, True),
-    schema.Optional('description', schema.check_string, ''),
-    schema.Optional('language_version', schema.check_string, 'default'),
-    schema.Optional('log_file', schema.check_string, ''),
-    schema.Optional('minimum_pre_commit_version', schema.check_string, '0'),
-    schema.Optional('stages', schema.check_array(schema.check_string), []),
-    schema.Optional('verbose', schema.check_bool, False),
+    cfgv.Optional('args', cfgv.check_array(cfgv.check_string), []),
+    cfgv.Optional('always_run', cfgv.check_bool, False),
+    cfgv.Optional('pass_filenames', cfgv.check_bool, True),
+    cfgv.Optional('description', cfgv.check_string, ''),
+    cfgv.Optional('language_version', cfgv.check_string, 'default'),
+    cfgv.Optional('log_file', cfgv.check_string, ''),
+    cfgv.Optional('minimum_pre_commit_version', cfgv.check_string, '0'),
+    cfgv.Optional('stages', cfgv.check_array(cfgv.check_string), []),
+    cfgv.Optional('verbose', cfgv.check_bool, False),
 )
-MANIFEST_SCHEMA = schema.Array(MANIFEST_HOOK_DICT)
+MANIFEST_SCHEMA = cfgv.Array(MANIFEST_HOOK_DICT)
 
 
 class InvalidManifestError(FatalError):
     pass
 
 
 load_manifest = functools.partial(
-    schema.load_from_filename,
+    cfgv.load_from_filename,
     schema=MANIFEST_SCHEMA,
     load_strategy=ordered_load,
     exc_tp=InvalidManifestError,
@@ -101,40 +93,40 @@ def validate_manifest_main(argv=None):
 _LOCAL_SENTINEL = 'local'
 _META_SENTINEL = 'meta'
 
-CONFIG_HOOK_DICT = schema.Map(
+CONFIG_HOOK_DICT = cfgv.Map(
     'Hook', 'id',
 
-    schema.Required('id', schema.check_string),
+    cfgv.Required('id', cfgv.check_string),
 
     # All keys in manifest hook dict are valid in a config hook dict, but
     # are optional.
     # No defaults are provided here as the config is merged on top of the
     # manifest.
     *[
-        schema.OptionalNoDefault(item.key, item.check_fn)
+        cfgv.OptionalNoDefault(item.key, item.check_fn)
         for item in MANIFEST_HOOK_DICT.items
         if item.key != 'id'
     ]
 )
-CONFIG_REPO_DICT = schema.Map(
+CONFIG_REPO_DICT = cfgv.Map(
     'Repository', 'repo',
 
-    schema.Required('repo', schema.check_string),
-    schema.RequiredRecurse('hooks', schema.Array(CONFIG_HOOK_DICT)),
+    cfgv.Required('repo', cfgv.check_string),
+    cfgv.RequiredRecurse('hooks', cfgv.Array(CONFIG_HOOK_DICT)),
 
-    schema.Conditional(
-        'sha', schema.check_string,
+    cfgv.Conditional(
+        'sha', cfgv.check_string,
         condition_key='repo',
-        condition_value=schema.NotIn(_LOCAL_SENTINEL, _META_SENTINEL),
+        condition_value=cfgv.NotIn(_LOCAL_SENTINEL, _META_SENTINEL),
         ensure_absent=True,
     ),
 )
-CONFIG_SCHEMA = schema.Map(
+CONFIG_SCHEMA = cfgv.Map(
     'Config', None,
 
-    schema.RequiredRecurse('repos', schema.Array(CONFIG_REPO_DICT)),
-    schema.Optional('exclude', schema.check_regex, '^$'),
-    schema.Optional('fail_fast', schema.check_bool, False),
+    cfgv.RequiredRecurse('repos', cfgv.Array(CONFIG_REPO_DICT)),
+    cfgv.Optional('exclude', cfgv.check_regex, '^$'),
+    cfgv.Optional('fail_fast', cfgv.check_bool, False),
 )
 
 
@@ -160,7 +152,7 @@ def ordered_load_normalize_legacy_config(contents):
 
 
 load_config = functools.partial(
-    schema.load_from_filename,
+    cfgv.load_from_filename,
     schema=CONFIG_SCHEMA,
     load_strategy=ordered_load_normalize_legacy_config,
     exc_tp=InvalidConfigError,
 
@@ -6,6 +6,7 @@
 
 from aspy.yaml import ordered_dump
 from aspy.yaml import ordered_load
+from cfgv import remove_defaults
 
 import pre_commit.constants as C
 from pre_commit import output
@@ -15,7 +16,6 @@
 from pre_commit.clientlib import load_config
 from pre_commit.commands.migrate_config import migrate_config
 from pre_commit.repository import Repository
-from pre_commit.schema import remove_defaults
 from pre_commit.util import CalledProcessError
 from pre_commit.util import cmd_output
 from pre_commit.util import cwd
 
@@ -3,11 +3,12 @@
 import argparse
 import re
 
+from cfgv import apply_defaults
+
 import pre_commit.constants as C
 from pre_commit import git
 from pre_commit.clientlib import load_config
 from pre_commit.clientlib import MANIFEST_HOOK_DICT
-from pre_commit.schema import apply_defaults
 
 
 def exclude_matches_any(filenames, include, exclude):
 
@@ -11,6 +11,8 @@
 
 import pkg_resources
 from cached_property import cached_property
+from cfgv import apply_defaults
+from cfgv import validate
 
 import pre_commit.constants as C
 from pre_commit import five
@@ -22,8 +24,6 @@
 from pre_commit.languages.all import languages
 from pre_commit.languages.helpers import environment_dir
 from pre_commit.prefix import Prefix
-from pre_commit.schema import apply_defaults
-from pre_commit.schema import validate
 
 
 logger = logging.getLogger('pre_commit')