Commit graph

261 commits

Author SHA1 Message Date
dmlb2000
845a3d5bdf adds top keys list of keys in hashes to put at the top of a hash
This adds custom sorting to preferencially add a list of top keys
at the start of any json hash in the json document
2016-11-03 09:41:23 -07:00
Anthony Sottile
8e0d7bab60 Merge pull request #145 from bdellegrazie/safe-yaml-#104
Use safe_load as per PyYAML documentation
2016-10-23 12:54:08 -04:00
Brett Delle Grazie
a234b23667 Use safe_load as per PyYAML documentation
resolves #104
2016-10-23 17:50:42 +01:00
Anthony Sottile
c8a1c91c76 Merge pull request #144 from jzafran/add-j2-extension-hooks
add j2 extension to trailing-whitespace and end-of-file-fixer
2016-10-18 16:49:44 -07:00
Jeremy
3620c87b09 add j2 extension to trailing-whitespace and end-of-file-fixer 2016-10-18 19:45:46 -04:00
Anthony Sottile
4c90c9557d Merge pull request #143 from rcmurphy/master
Add .groovy and .tex files to whitespace hooks
2016-10-07 10:42:26 -07:00
Rebecca Claire Murphy
17fcaab576
Add .groovy and .tex files to whitespace hooks
Modifies the end-of-file-fixer and trailing-whitespace hooks to include
.groovy and .tex (TeX/LaTeX) files.
2016-10-07 11:50:40 -04:00
Anthony Sottile
18d7035de5 Let's make the files: for the two whitespace fixers the same 2016-09-01 10:08:04 -07:00
Anthony Sottile
629896ed4a Merge pull request #142 from htmldoug/add-scala-typescript
end-of-file-fixer & trailing-whitespace: Add .scala and .ts files.
2016-09-01 10:06:09 -07:00
Doug Roper
9a68f58541 end-of-file-fixer & trailing-whitespace: Add .scala and .ts files. 2016-09-01 12:34:02 -04:00
Anthony Sottile
1858edd9da Merge pull request #135 from Lucas-C/master
trailing-whitespace hook: restoring original file in case of failure - fixes #134
2016-08-31 07:35:34 -07:00
Lucas Cimon
cb23c48b0d Post-review fixes 2016-08-31 11:44:59 +02:00
Lucas Cimon
c3c870c398 trailing-whitespace hook: support for CRLFs 2016-08-30 10:34:06 +01:00
Anthony Sottile
09d1747840 Merge pull request #139 from pre-commit/no_py33
Drop py33, add py35
2016-08-22 14:52:13 -07:00
Anthony Sottile
8be6f4c77e Remove pylint 2016-08-22 14:38:49 -07:00
Anthony Sottile
d19360c179 Drop py33, add py35 2016-08-22 14:32:12 -07:00
Anthony Sottile
5744ccfd2a Merge pull request #138 from pre-commit/asottile-patch-1
Document `--indent` for pretty-format-json
2016-08-22 14:27:20 -07:00
Anthony Sottile
b4a9600fa5 Document --indent for pretty-format-json 2016-08-22 14:23:23 -07:00
Lucas Cimon
eaad923dd4 trailing-whitespace hook: Switching from using fileinput to a tempfile and whitespace substitution in binary mode 2016-08-20 11:59:10 +01:00
Lucas Cimon
bc5e7f2d72 trailing-whitespace hook: restoring original file in case of failure - fixes #134 2016-08-19 18:26:33 +02:00
Anthony Sottile
775a7906cd pre-commit-hooks is a pure python package 2016-08-12 10:24:39 -07:00
Anthony Sottile
6925455ef7 v0.6.0 2016-08-12 10:23:38 -07:00
Anthony Sottile
a43122c5f4 Merge pull request #133 from pre-commit/customizable_encoding_pragma
Allow encoding pragma to be customizable
2016-08-12 19:19:28 +02:00
Anthony Sottile
693709e761 Allow encoding pragma to be customizable 2016-08-12 10:11:10 -07:00
Anthony Sottile
3fa0265235 Merge pull request #127 from vinayinvicible/requirements
handle editable requirements properly
2016-07-02 16:05:51 -07:00
Vinay Karanam
81bd74d9c3 coverage fix 2016-07-03 04:31:19 +05:30
Vinay Karanam
c58ae08fed requirements fixer output is similar to pip freeze 2016-07-03 04:10:20 +05:30
Anthony Sottile
493665a5fc Merge pull request #126 from sanmai-NL/enhance_file_extnsn_pttrns_trlng_whtspc_fxr
Add file patterns for trailing whitespace fixer
2016-06-27 11:28:44 -07:00
Sander Maijers
8a1ff1d39e
Add file patterns for trailing whitespace fixer
* Add extensions for AsciiDoctor, C, C++, OCaml, R, Rust.
* Reorder alphabetically.
2016-06-27 20:20:20 +02:00
Anthony Sottile
144c3857cd Merge pull request #123 from Oscar-Garcia/patch-1
Update debug_statement_hook.py
2016-06-20 06:42:50 -07:00
Oscar-Garcia
ea320d7463 Update debug_statement_hook.py
Adds celery rdb as debugger: http://docs.celeryproject.org/en/latest/tutorials/debugging.html
2016-06-20 09:41:22 +02:00
Anthony Sottile
6dfcb89af3 Merge pull request #122 from sanmai-NL/JSON_arbitrary_indentation_separator
Fix exception raising logic to match validation issues
2016-06-13 08:50:53 -07:00
Sander Maijers
abaf0d12de
Fix exc. raising logic to match validation issues 2016-06-13 11:34:55 +02:00
Anthony Sottile
cf3aabe9b1 Merge pull request #120 from sanmai-NL/JSON_arbitrary_indentation_separator
Refactor legacy `indent: int` -> `indent: str`
2016-06-12 10:25:59 -07:00
Sander Maijers
a5628863e8
Refactor legacy indent: int -> indent: str
The type of `indent` parameter is preferably `str`. See
http://simplejson.readthedocs.io/en/latest/index.html?highlight=dump#simplejson.dump
. This change allows to specify TABs as indentation delimiter to
`pretty_format_json`. Add input validator/converter for backward compat.
2016-06-12 19:19:07 +02:00
Anthony Sottile
49a26cbfb6 Merge pull request #121 from sanmai-NL/Tox_fix_autosigning_upon_git_commit
Increase robustness of tests involving `git`
2016-06-12 10:08:00 -07:00
Sander Maijers
9e89b7616a
Increase robustness of tests involving git
1. Disable automatic `git commit` GPG-signing, since that requires interaction.
   This issue was encountered in practice by me, causing spurious test failures
2. In case path operands could turn out to start with dashes, escape the
   operand list with '--'.
2016-06-12 18:58:30 +02:00
Anthony Sottile
6b1aa19425 Merge pull request #117 from pre-commit/simplify_tests
Simplify the tests
2016-05-27 14:34:27 -07:00
Anthony Sottile
a99475afa0 Simplify the tests 2016-05-27 14:09:50 -07:00
Anthony Sottile
b64436cdda Merge pull request #116 from pre-commit/check_merge_conflict_binary_files
Fix check-merge-conflict against binary files
2016-05-26 12:02:43 -07:00
Anthony Sottile
b4e29b5e63 Use newline='' to avoid automatic newline translation 2016-05-26 11:45:28 -07:00
Anthony Sottile
4a01f64c8f Fix check-merge-conflict against binary files 2016-05-26 11:20:32 -07:00
Anthony Sottile
adbb569fe9 v0.5.1 2016-05-16 09:12:32 -07:00
Anthony Sottile
35548254ad Merge pull request #114 from wting/wting_support_diff3_conflictstyle
Add diff3 conflictstyle support for git merge conflicts.
2016-04-30 21:16:00 -07:00
William Ting
c92b46587d Add diff3 conflictstyle support for git merge conflicts. 2016-04-30 20:35:33 -07:00
Anthony Sottile
6f2b0a27e5 Merge pull request #111 from pre-commit/remove_coding_pragma
Add a --remove option to fix-encoding-pragma
2016-04-27 11:34:56 -07:00
Anthony Sottile
03bf17f2b0 Add a --remove option to fix-encoding-pragma 2016-04-27 11:18:14 -07:00
Anthony Sottile
17478a0a50 Style fixups 2016-04-14 08:25:52 -07:00
Anthony Sottile
ea867c2e68 Merge pull request #109 from mattclegg/no-sort-keys
Adding no-sort-keys to pretty_format_json
2016-04-14 08:11:26 -07:00
mattclegg
f775891717 Drop messy py26 support in favour of 100% coverage 2016-04-14 11:16:18 +01:00