mirror of
https://github.com/adrienverge/yamllint.git
synced 2025-02-25 18:55:20 -06:00
[WIP] Fix for #334 (directories like 'dir.yaml' + recursive search)
Partially reverts a221898 to fix https://github.com/adrienverge/yamllint/issues/334
Linked to https://github.com/cpburnz/python-path-specification/issues/41.
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -5,3 +5,5 @@ __pycache__
|
||||
/yamllint.egg-info
|
||||
/build
|
||||
/.eggs
|
||||
*.yaml
|
||||
!*.yaml/
|
||||
|
||||
@@ -2,8 +2,11 @@
|
||||
|
||||
yaml-files:
|
||||
- '*.yaml'
|
||||
- '!*.yaml/'
|
||||
- '*.yml'
|
||||
- '!*.yml/'
|
||||
- '.yamllint'
|
||||
- '!.yamllint/'
|
||||
|
||||
rules:
|
||||
braces: enable
|
||||
|
||||
@@ -32,8 +32,14 @@ class YamlLintConfig(object):
|
||||
|
||||
self.ignore = None
|
||||
|
||||
self.yaml_files = pathspec.PathSpec.from_lines(
|
||||
'gitwildmatch', ['*.yaml', '*.yml', '.yamllint'])
|
||||
self.yaml_files = pathspec.PathSpec.from_lines('gitwildmatch', [
|
||||
'*.yaml',
|
||||
'!*.yaml/',
|
||||
'*.yml',
|
||||
'!*.yml/',
|
||||
'.yamllint',
|
||||
'!.yamllint/',
|
||||
])
|
||||
|
||||
self.locale = None
|
||||
|
||||
@@ -48,7 +54,7 @@ class YamlLintConfig(object):
|
||||
return self.ignore and self.ignore.match_file(filepath)
|
||||
|
||||
def is_yaml_file(self, filepath):
|
||||
return self.yaml_files.match_file(os.path.basename(filepath))
|
||||
return self.yaml_files.match_file(filepath)
|
||||
|
||||
def enabled_rules(self, filepath):
|
||||
return [yamllint.rules.get(id) for id, val in self.rules.items()
|
||||
|
||||
Reference in New Issue
Block a user