pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2026-04-07 20:26:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #351 from pre-commit/ruamel_yaml

Browse source 
switch from pyyaml to ruamel.yaml
This commit is contained in:
Anthony Sottile 2018-12-28 14:18:07 -08:00 • committed by GitHub
commit de9e7a04b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pre_commit_hooks/check_yaml.py
View file

@ -4,12 +4,9 @@ import argparse
import collections import collections
import sys import sys
import yaml import ruamel.yaml
try: yaml = ruamel.yaml.YAML(typ='safe')
from yaml.cyaml import CSafeLoader as Loader
except ImportError: # pragma: no cover (no libyaml-dev / pypy)
Loader = yaml.SafeLoader
def _exhaust(gen): def _exhaust(gen):
@ -57,8 +54,9 @@ def check_yaml(argv=None):
retval = 0 retval = 0
for filename in args.filenames: for filename in args.filenames:
try: try:
load_fn(open(filename), Loader=Loader) with open(filename) as f:
except yaml.YAMLError as exc: load_fn(f)
except ruamel.yaml.YAMLError as exc:
print(exc) print(exc)
retval = 1 retval = 1
return retval return retval

2
setup.py
View file

@ -25,7 +25,7 @@ setup(
packages=find_packages(exclude=('tests*', 'testing*')), packages=find_packages(exclude=('tests*', 'testing*')),
install_requires=[ install_requires=[
'flake8', 'flake8',
'pyyaml', 'ruamel.yaml>=0.15',
'six', 'six',
], ],
entry_points={ entry_points={