Merge pull request #4 from pre-commit/master

merge from upstream
This commit is contained in:
Evan Felix 2017-03-16 23:09:28 -07:00 committed by GitHub
commit 564a82ca89
31 changed files with 274 additions and 61 deletions

View file

@ -6,7 +6,7 @@ setup(
name='pre_commit_hooks',
description='Some out-of-the-box hooks for pre-commit.',
url='https://github.com/pre-commit/pre-commit-hooks',
version='0.6.1',
version='0.7.1',
author='Anthony Sottile',
author_email='asottile@umich.edu',
@ -14,11 +14,10 @@ setup(
classifiers=[
'License :: OSI Approved :: MIT License',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
],
@ -27,7 +26,6 @@ setup(
install_requires=[
# quickfix to prevent pep8 conflicts
'flake8!=2.5.3',
'argparse',
'autopep8>=1.1',
'pyyaml',
'simplejson',