commit 9ce45609a92f648c87b42207410386fd69a5d1e5
author Anthony Sottile <asottile@umich.edu> Sun Mar 08 12:38:35 2015 -0700
committer Anthony Sottile <asottile@umich.edu> Sun Mar 08 12:38:35 2015 -0700
tree 0f0dbcd376a9fb5b5dc7a0bc29230433a661b332
parent 4cb861acec26e0c62e2b246fafd115f87949743a
parent 68a7729327ce204b8b0e72163521e12f7d1b01bc

Merge pull request #43 from campaul/detect_private_key

Detect OpenSSH private keys

.pre-commit-config.yaml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 24e28a3..e904c6e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,5 +1,5 @@
 -   repo: git@github.com:pre-commit/pre-commit-hooks
-    sha: b03733bc86d9e8b2564a5798ade40d64baae3055
+    sha: 4078cbedf0360dce2b7cd02cb2812fc50b76b98d
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer

CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 9685f6c..a6c76bc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+0.4.1
+=====
+- Respect configuration when running autopep8
+- Quickfix for pep8 version conflicts
+
 0.4.0
 =====
 - Fix trailing-whitespace on OS X

setup.py

diff --git a/setup.py b/setup.py
index 25b264d..e4f0900 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
     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.4.0',
+    version='0.4.1',
 
     author='Anthony Sottile',
     author_email='asottile@umich.edu',
@@ -26,9 +26,10 @@
 
     packages=find_packages('.', exclude=('tests*', 'testing*')),
     install_requires=[
+        # quickfix to prevent pep8 conflicts
+        'flake8',
         'argparse',
         'autopep8>=1.1',
-        'flake8',
         'plumbum',
         'pyflakes',
         'pyyaml',