Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c8fc170ff0 | ||
|
|
c4a3e15ff0 | ||
|
|
db57127971 | ||
|
|
c8e516be2f | ||
|
|
1c0dd48ccd | ||
|
|
f4edb85a04 |
@@ -8,4 +8,4 @@
|
|||||||
description: This hook runs yamllint.
|
description: This hook runs yamllint.
|
||||||
entry: yamllint
|
entry: yamllint
|
||||||
language: python
|
language: python
|
||||||
files: \.(yaml|yml)$
|
types: [file, yaml]
|
||||||
@@ -1,6 +1,13 @@
|
|||||||
Changelog
|
Changelog
|
||||||
=========
|
=========
|
||||||
|
|
||||||
|
1.8.2 (2017-10-10)
|
||||||
|
------------------
|
||||||
|
|
||||||
|
- Be clearer about the `ignore` conf type
|
||||||
|
- Update pre-commit hook file
|
||||||
|
- Add documentation for pre-commit
|
||||||
|
|
||||||
1.8.1 (2017-07-04)
|
1.8.1 (2017-07-04)
|
||||||
------------------
|
------------------
|
||||||
|
|
||||||
|
|||||||
13
docs/conf.py
13
docs/conf.py
@@ -4,6 +4,7 @@
|
|||||||
|
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
|
from unittest.mock import MagicMock
|
||||||
|
|
||||||
sys.path.insert(0, os.path.abspath('..')) # noqa
|
sys.path.insert(0, os.path.abspath('..')) # noqa
|
||||||
|
|
||||||
@@ -40,3 +41,15 @@ htmlhelp_basename = 'yamllintdoc'
|
|||||||
man_pages = [
|
man_pages = [
|
||||||
('index', 'yamllint', '', [u'Adrien Vergé'], 1)
|
('index', 'yamllint', '', [u'Adrien Vergé'], 1)
|
||||||
]
|
]
|
||||||
|
|
||||||
|
# -- Build with sphinx automodule without needing to install third-party libs
|
||||||
|
|
||||||
|
|
||||||
|
class Mock(MagicMock):
|
||||||
|
@classmethod
|
||||||
|
def __getattr__(cls, name):
|
||||||
|
return MagicMock()
|
||||||
|
|
||||||
|
|
||||||
|
MOCK_MODULES = ['pathspec', 'yaml']
|
||||||
|
sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
|
||||||
|
|||||||
@@ -26,3 +26,4 @@ Table of contents
|
|||||||
disable_with_comments
|
disable_with_comments
|
||||||
development
|
development
|
||||||
text_editors
|
text_editors
|
||||||
|
integration
|
||||||
|
|||||||
17
docs/integration.rst
Normal file
17
docs/integration.rst
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
Integration with other software
|
||||||
|
===============================
|
||||||
|
|
||||||
|
Integration with pre-commit
|
||||||
|
---------------------------
|
||||||
|
|
||||||
|
You can integrate yamllint in `pre-commit <http://pre-commit.com/>`_ tool.
|
||||||
|
Here is an example, to add in your .pre-commit-config.yaml
|
||||||
|
|
||||||
|
.. code:: yaml
|
||||||
|
|
||||||
|
---
|
||||||
|
# Update the sha variable with the release version that you want, from the yamllint repo
|
||||||
|
- repo: https://github.com/adrienverge/yamllint.git
|
||||||
|
sha: v1.8.1
|
||||||
|
hooks:
|
||||||
|
- id: yamllint
|
||||||
@@ -22,7 +22,7 @@ indentation, etc."""
|
|||||||
|
|
||||||
|
|
||||||
APP_NAME = 'yamllint'
|
APP_NAME = 'yamllint'
|
||||||
APP_VERSION = '1.8.1'
|
APP_VERSION = '1.8.2'
|
||||||
APP_DESCRIPTION = __doc__
|
APP_DESCRIPTION = __doc__
|
||||||
|
|
||||||
__author__ = u'Adrien Vergé'
|
__author__ = u'Adrien Vergé'
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ class YamlLintConfig(object):
|
|||||||
if 'ignore' in conf:
|
if 'ignore' in conf:
|
||||||
if type(conf['ignore']) != str:
|
if type(conf['ignore']) != str:
|
||||||
raise YamlLintConfigError(
|
raise YamlLintConfigError(
|
||||||
'invalid config: ignore should be a list of patterns')
|
'invalid config: ignore should contain file patterns')
|
||||||
self.ignore = pathspec.PathSpec.from_lines(
|
self.ignore = pathspec.PathSpec.from_lines(
|
||||||
'gitwildmatch', conf['ignore'].splitlines())
|
'gitwildmatch', conf['ignore'].splitlines())
|
||||||
|
|
||||||
@@ -112,7 +112,7 @@ def validate_rule_conf(rule, conf):
|
|||||||
type(conf['ignore']) != pathspec.pathspec.PathSpec):
|
type(conf['ignore']) != pathspec.pathspec.PathSpec):
|
||||||
if type(conf['ignore']) != str:
|
if type(conf['ignore']) != str:
|
||||||
raise YamlLintConfigError(
|
raise YamlLintConfigError(
|
||||||
'invalid config: ignore should be a list of patterns')
|
'invalid config: ignore should contain file patterns')
|
||||||
conf['ignore'] = pathspec.PathSpec.from_lines(
|
conf['ignore'] = pathspec.PathSpec.from_lines(
|
||||||
'gitwildmatch', conf['ignore'].splitlines())
|
'gitwildmatch', conf['ignore'].splitlines())
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user