Commit graph

721 commits

Author SHA1 Message Date
Anthony Sottile
6076fd1b15 Support rebase conflicts in check-merge-conflicts 2017-06-12 10:39:07 -07:00
Anthony Sottile
78818b90cd v0.8.0 2017-06-06 14:26:36 -07:00
Anthony Sottile
5bf6c09bfa Merge pull request #186 from pre-commit/attempt_to_fix_json_hook
Attempt to fix json hook
2017-03-20 11:53:31 -07:00
Anthony Sottile
c71b80b6ed bump revision of pre-commit-hooks 2017-03-20 11:26:07 -07:00
Anthony Sottile
dc50b7f09c Attempt to fix the json hook under test 2017-03-20 11:25:45 -07:00
Evan Felix
a8592669d9 Add a no commit to specific branch hook. (#185)
* add no commit code and config

* add the code

* remove version tweak

* fix logic, remove newline

* add Tests and cleanup testing issues

* remove extraneous modules

* cleanup some pep8 and flake issues

* reorder imports

* more fixes for syntax checking

* code cleanup based off asottile comments

* Use Contractions Properly, alphabatize new hook.

* Adding support for branches with a slash in them.
2017-03-20 10:36:51 -07:00
Anthony Sottile
b95dcad616 Fixups 2017-03-20 08:24:58 -07:00
Anthony Sottile
4c3cc8f3ed Merge pull request #184 from ushuz/pretty-json-no-ensure-ascii
Add --no-ensure-ascii option to pretty-format-json hook
2017-03-20 08:23:15 -07:00
ushuz
10f8bd2f22 Add unit test for --no-ensure-ascii option 2017-03-20 20:19:01 +08:00
John Hu
543c5c7e1a Add an option to disable ensure_ascii 2017-03-20 20:19:01 +08:00
Anthony Sottile
414cfa7b23 Merge pull request #182 from Hirevisor/master
Handling default django test filename of "tests.py"
2017-03-15 07:35:07 -07:00
Oliver Zhou
c380d0b3e3 Handling default django test filename of "tests.py" 2017-03-15 00:40:53 -07:00
Anthony Sottile
ef7c425a3e Require a newer version of autopep8 2017-03-13 14:34:13 -07:00
Anthony Sottile
c847dd3f2e Merge pull request #179 from pre-commit/pyupgrade
Add pyupgrade
2017-03-12 18:17:06 -07:00
Anthony Sottile
9cee71b5df Add pyupgrade 2017-03-12 18:01:29 -07:00
Anthony Sottile
a11d9314b2 Merge pull request #177 from pre-commit/asottile-patch-1
Change `sha` in readme to be a real value
2017-02-25 15:48:10 -05:00
Anthony Sottile
6ff0a78460 Change sha in readme to be a real value
I noticed in our traffic on pre-commit/pre-commit that there were a lot of hits to [this issue](https://github.com/pre-commit/pre-commit/issues/366) presumably due to copy pasting from this readme.

This should reduce frustration in that regard (we'll have to remember to update this whenever bumping the version).
2017-02-25 12:33:07 -08:00
Anthony Sottile
e626cd5709 Merge pull request #175 from miketheman/miketheman/allow-missing-aws
Add flag to detect-aws-credentials to allow missing keys
2017-02-10 10:07:43 -08:00
Mike Fiedler
312e721ce9
Add flag to detect-aws-credentials to allow missing keys
In the event that there exists no configuration for AWS credentials and
they are not exported in to the current environment, a flag may be
passed to allow exiting the hook successfully.

Resolves #174

Signed-off-by: Mike Fiedler <miketheman@gmail.com>
2017-02-10 12:54:03 -05:00
Anthony Sottile
20f04626a1 v0.7.1 2017-02-07 10:00:42 -08:00
Anthony Sottile
f9ce156915 Merge pull request #172 from pre-commit/fix_trailing_whitespace
Only return nonzero when rewriting whitespace
2017-02-07 09:59:57 -08:00
Anthony Sottile
81147337c5 Only return nonzero when rewriting whitespace 2017-02-07 09:45:31 -08:00
Anthony Sottile
46251c9523 Fix coveralls badge 2017-02-01 08:30:58 -08:00
Anthony Sottile
63142f2d4e v0.7.0 2017-01-21 18:32:17 -08:00
Anthony Sottile
2df9948c67 Merge pull request #166 from pre-commit/pre_commit_hooks_yaml
Add .pre-commit-hooks.yaml for forward compatibility
2017-01-21 18:26:46 -08:00
Anthony Sottile
7752c42452 Add .pre-commit-hooks.yaml for forward compatibility
See pre-commit/pre-commit#470
2017-01-21 18:03:59 -08:00
Anthony Sottile
6f21fdf27f Merge pull request #165 from pre-commit/py36
Test py36 instead of py34
2017-01-21 17:21:35 -08:00
Anthony Sottile
bec44063b0 Test py36 instead of py34 2017-01-20 20:44:44 -08:00
Anthony Sottile
5da199bb8d Formatting fixups 2017-01-03 13:13:44 -08:00
Anthony Sottile
47996656b4 Merge pull request #162 from Dunedan/improve-aws-credential-searching
Improve searching for configured AWS credentials
2017-01-03 16:11:30 -05:00
Anthony Sottile
9c0460baa0 Merge pull request #163 from pre-commit/update_no_cover_for_appveyor
appveyor installed git-lfs, fix coverage
2017-01-03 16:00:54 -05:00
Anthony Sottile
a7971b7d26 appveyor installed git-lfs, fix coverage 2017-01-03 12:56:22 -08:00
Daniel Roschka
3939aee4a3 Address issues mentioned in review 2017-01-03 19:05:49 +01:00
Daniel Roschka
53697318ee Fix a typo in the README 2016-12-30 16:53:09 +01:00
Daniel Roschka
0fd09bf67a Add AWS_CONFIG_FILE to the environment variables
Turns out there is an additional environment variable AWS_CONFIG_FILE,
which gets evaluated for finding configuration files as well. This
commit adds support for it.
2016-12-30 10:39:38 +01:00
Daniel Roschka
b0d4cdb1ee Improve searching for configured AWS credentials
The previous approach for finding AWS credentials was pretty naive and
only covered contents of a single file (~/.aws/credentials by
default).

The AWS CLI documentation states various other ways to configure
credentials which weren't covered:
https://docs.aws.amazon.com/cli/latest/topic/config-vars.html#credentials
Even that aren't all ways, a look into the code shows:
https://github.com/boto/botocore/blob/develop/botocore/credentials.py

This commit changes the behavior so the hook will behave in a way
that if the AWS CLI is able to obtain credentials from local files,
the hook will find them as well.

The changes in detail are:
- detect AWS session tokens and handle them like secret keys.
- always search credentials in the default AWS CLI file locations
  ( ~/.aws/config, ~/.aws/credentials, /etc/boto.cfg and ~/.boto)
- detect AWS credentials configured via environment variables in
  AWS_SECRET_ACCESS_KEY, AWS_SECURITY_TOKEN and AWS_SESSION_TOKEN
- check additional configuration files configured via environment
  variables (AWS_CREDENTIAL_FILE, AWS_SHARED_CREDENTIALS_FILE and
  BOTO_CONFIG)
- print out the first four characters of each secret found in files to
  be checked in, to make it easier to figure out, what the secrets
  were, which were going to be checked in
- improve error handling for parsing ini-files
- improve tests

There is a major functional change introduced by this commit:
Locations the AWS CLI gets credentials from are always searched and
there is no way to disable them. --credentials-file is still there to
specify one or more additional files to search credentials in. It's
the purpose of this hook to find and check files for found
credentials, so it should work in any case. As this commit also
improves error handling for not-existing or malformed configuration
files, it should be no big deal.

Receiving credentials via the EC2 and ECS meta data services is not
covered intentionally, to not further increase the amount of changes
in this commit and as it's probably an edge case anyway to have this
hook running in such an environment.
2016-12-30 08:41:24 +01:00
Chris Kuehl
9573c13884 Merge pull request #160 from Dunedan/detect-ed255519-keys
Detect Ed25519 keys as well
2016-12-26 16:55:50 -06:00
Chris Kuehl
cdb3e2e4bf Add trailing comma 2016-12-26 14:51:26 -08:00
Daniel Roschka
c549cb25a1 Detect Ed25519 keys as well
Ed255519 keys generated by OpenSSH contain "BEGIN OPENSSH PRIVATE KEY"
as identifier. This commit adds coverage for such keys as well.
2016-12-26 19:09:53 +01:00
Anthony Sottile
96fb7fa10f Document pretty-format-json. Resolves #156 2016-12-07 10:44:29 -08:00
Anthony Sottile
52582865ab Merge pull request #155 from pre-commit/asottile-patch-1
Also remove git variables from appveyor
2016-12-01 23:31:31 -08:00
Anthony Sottile
75283ae18f Also remove git variables from appveyor 2016-12-01 16:16:40 -08:00
Anthony Sottile
af7659de18 Merge pull request #154 from alzeih/patch-1
Fix test error "fatal: empty ident name (for <(null)>) not allowed"
2016-12-01 16:09:00 -08:00
alzeih
0637a50cc2 Fix test error "fatal: empty ident name (for <(null)>) not allowed"
This occurs when there is no global setting for git config options user.name and user.email

An example of the error shown below:

E           pre_commit.util.CalledProcessError: Command: ('/usr/bin/git', 'commit', '-m', 'init', '--allow-empty')
E           Return code: 128
E           Expected return code: 0
E           Output: (none)
E           Errors:
E
E               *** Please tell me who you are.
E
E               Run
E
E                 git config --global user.email "you@example.com"
E                 git config --global user.name "Your Name"
E
E               to set your account's default identity.
E               Omit --global to set the identity only in this repository.
E
E               fatal: empty ident name (for <(null)>) not allowed
2016-12-02 12:50:20 +13:00
Anthony Sottile
77a7bba2f9 v0.6.1 2016-11-30 10:40:03 -08:00
Anthony Sottile
fa5003d201 Merge pull request #153 from chriskuehl/add-forbid-submodules-to-hooks
Add forbid-new-submodules to hooks.yaml
2016-11-30 10:35:59 -08:00
Chris Kuehl
4b928ab06b Add forbid-new-submodules to hooks.yaml 2016-11-30 10:25:51 -08:00
Chris Kuehl
7bcb6a92bf Merge pull request #152 from pre-commit/forbid_new_submodules
Add a new hook to forbid new submodules
2016-11-30 10:07:07 -08:00
Anthony Sottile
e3e4378173 pip dropped pypy3, so will we 2016-11-30 09:59:37 -08:00
Anthony Sottile
70e405ede2 Add a new hook to forbid new submodules 2016-11-30 09:56:42 -08:00