fixes for cfgv>=2

asottile · asottile · commit 625750eeef30 · 2019-05-27T13:37:49.000-07:00
diff --git a/pre_commit/clientlib.py b/pre_commit/clientlib.py
@@ -149,10 +149,16 @@ def _entry(modname):
     )
 
 
-def warn_unknown_keys(extra, orig_keys):
+def warn_unknown_keys_root(extra, orig_keys, dct):
     logger.warning(
-        'Unexpected config key(s): {}'.format(
-            ', '.join(sorted(extra)),
+        'Unexpected key(s) present at root: {}'.format(', '.join(extra)),
+    )
+
+
+def warn_unknown_keys_repo(extra, orig_keys, dct):
+    logger.warning(
+        'Unexpected key(s) present on {}: {}'.format(
+            dct['repo'], ', '.join(extra),
         ),
     )
 
@@ -235,10 +241,7 @@ def warn_unknown_keys(extra, orig_keys):
     ),
 
     MigrateShaToRev(),
-    cfgv.WarnAdditionalKeys(
-        ('repo', 'rev', 'hooks'),
-        warn_unknown_keys,
-    ),
+    cfgv.WarnAdditionalKeys(('repo', 'rev', 'hooks'), warn_unknown_keys_repo),
 )
 DEFAULT_LANGUAGE_VERSION = cfgv.Map(
     'DefaultLanguageVersion', None,
@@ -273,7 +276,7 @@ def warn_unknown_keys(extra, orig_keys):
             'fail_fast',
             'minimum_pre_commit_version',
         ),
-        warn_unknown_keys,
+        warn_unknown_keys_root,
     ),
 )
 
diff --git a/pre_commit/repository.py b/pre_commit/repository.py
@@ -105,7 +105,7 @@ def create(cls, src, prefix, dct):
         extra_keys = set(dct) - set(_KEYS)
         if extra_keys:
             logger.warning(
-                'Unexpected keys present on {} => {}: '
+                'Unexpected key(s) present on {} => {}: '
                 '{}'.format(src, dct['id'], ', '.join(sorted(extra_keys))),
             )
         return cls(src=src, prefix=prefix, **{k: dct[k] for k in _KEYS})
diff --git a/setup.cfg b/setup.cfg
@@ -25,7 +25,7 @@ classifiers =
 packages = find:
 install_requires =
     aspy.yaml
-    cfgv>=1.4.0
+    cfgv>=2.0.0
     identify>=1.0.0
     importlib-metadata
     nodeenv>=0.11.1
diff --git a/tests/clientlib_test.py b/tests/clientlib_test.py
@@ -133,7 +133,8 @@ def test_validate_warn_on_unknown_keys_at_repo_level(tmpdir, caplog):
         (
             'pre_commit',
             logging.WARNING,
-            'Unexpected config key(s): args',
+            'Unexpected key(s) present on https://gitlab.com/pycqa/flake8: '
+            'args',
         ),
     ]
 
@@ -155,7 +156,7 @@ def test_validate_warn_on_unknown_keys_at_top_level(tmpdir, caplog):
         (
             'pre_commit',
             logging.WARNING,
-            'Unexpected config key(s): foo',
+            'Unexpected key(s) present at root: foo',
         ),
     ]
 
diff --git a/tests/repository_test.py b/tests/repository_test.py
@@ -588,7 +588,7 @@ def test_unknown_keys(store, fake_log_handler):
         }],
     }
     _get_hook(config, store, 'too-much')
-    expected = 'Unexpected keys present on local => too-much: foo, hello'
+    expected = 'Unexpected key(s) present on local => too-much: foo, hello'
     assert fake_log_handler.handle.call_args[0][0].msg == expected
 
 

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ def create(cls, src, prefix, dct):`
`105`	`105`	`extra_keys = set(dct) - set(_KEYS)`
`106`	`106`	`if extra_keys:`
`107`	`107`	`logger.warning(`
`108`		`- 'Unexpected keys present on {} => {}: '`
	`108`	`+ 'Unexpected key(s) present on {} => {}: '`
`109`	`109`	`'{}'.format(src, dct['id'], ', '.join(sorted(extra_keys))),`
`110`	`110`	`)`
`111`	`111`	`return cls(src=src, prefix=prefix, **{k: dct[k] for k in _KEYS})`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,8 @@ def test_validate_warn_on_unknown_keys_at_repo_level(tmpdir, caplog):`
`133`	`133`	`(`
`134`	`134`	`'pre_commit',`
`135`	`135`	`logging.WARNING,`
`136`		`- 'Unexpected config key(s): args',`
	`136`	`+ 'Unexpected key(s) present on https://gitlab.com/pycqa/flake8: '`
	`137`	`+ 'args',`
`137`	`138`	`),`
`138`	`139`	`]`
`139`	`140`
`@@ -155,7 +156,7 @@ def test_validate_warn_on_unknown_keys_at_top_level(tmpdir, caplog):`
`155`	`156`	`(`
`156`	`157`	`'pre_commit',`
`157`	`158`	`logging.WARNING,`
`158`		`- 'Unexpected config key(s): foo',`
	`159`	`+ 'Unexpected key(s) present at root: foo',`
`159`	`160`	`),`
`160`	`161`	`]`
`161`	`162`
Original file line number	Diff line number	Diff line change
`@@ -588,7 +588,7 @@ def test_unknown_keys(store, fake_log_handler):`
`588`	`588`	`}],`
`589`	`589`	`}`
`590`	`590`	`_get_hook(config, store, 'too-much')`
`591`		`- expected = 'Unexpected keys present on local => too-much: foo, hello'`
	`591`	`+ expected = 'Unexpected key(s) present on local => too-much: foo, hello'`
`592`	`592`	`assert fake_log_handler.handle.call_args[0][0].msg == expected`
`593`	`593`
`594`	`594`