search

adrienverge / yamllint

A linter for YAML files.
GNU General Public License v3.0
2.86k stars 273 forks source link

Add forbid-duplicated-merge-keys option to key-duplicates rule #614

Closed travbale closed 10 months ago

travbale commented 11 months ago

Closes #561

coveralls commented 11 months ago

Coverage Status

coverage: 99.399% (+0.002%) from 99.397% when pulling 0f857307a03f0e7cede4c32f73204e9483c2865e on travbale:forbid-duplicated-merge-keys into ca7f8b972cbbc6058e8d532e82a05d34a9897cd7 on adrienverge:master.

travbale commented 10 months ago

Thanks for taking a look. Will work to get these in.

travbale commented 10 months ago

Made the requested changes. I have an unrelated test failing I'm trying to figure out. 

======================================================================
FAIL: test_extended_ignore_str (tests.test_config.ExtendedConfigTestCase.test_extended_ignore_str)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/travbale/yamllint/tests/test_config.py", line 388, in test_extended_ignore_str
    self.assertEqual(c.ignore.match_file('test.yaml'), False)
AssertionError: None != False
adrienverge commented 10 months ago

Made the requested changes. I have an unrelated test failing I'm trying to figure out.

======================================================================
FAIL: test_extended_ignore_str (tests.test_config.ExtendedConfigTestCase.test_extended_ignore_str)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/travbale/yamllint/tests/test_config.py", line 388, in test_extended_ignore_str
    self.assertEqual(c.ignore.match_file('test.yaml'), False)
AssertionError: None != False

Thanks a lot, I'll have a look!

Please ignore the failing test, it's due to a small bug in the new pathspec version, see https://github.com/cpburnz/python-pathspec/issues/84.