From b025b6d55f935ed2ba6a60bcfc2dcfff69151bfe Mon Sep 17 00:00:00 2001 From: Chris Kuehl Date: Sat, 25 Jul 2015 23:06:12 -0700 Subject: [PATCH 1/3] Run pre-commit hooks in tox (and thus travis) --- .pre-commit-config.yaml | 6 +++--- tox.ini | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 75e3ae24..80452e60 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,4 +1,4 @@ -- repo: git@github.com:pre-commit/pre-commit-hooks +- repo: https://github.com/pre-commit/pre-commit-hooks.git sha: cf550fcab3f12015f8676b8278b30e1a5bc10e70 hooks: - id: trailing-whitespace @@ -11,12 +11,12 @@ - id: name-tests-test - id: requirements-txt-fixer - id: flake8 -- repo: git@github.com:pre-commit/pre-commit +- repo: https://github.com/pre-commit/pre-commit.git sha: 8dba3281d5051060755459dcf88e28fc26c27526 hooks: - id: validate_config - id: validate_manifest -- repo: git@github.com:asottile/reorder_python_imports +- repo: https://github.com/asottile/reorder_python_imports.git sha: 3d86483455ab5bd06cc1069fdd5ac57be5463f10 hooks: - id: reorder-python-imports diff --git a/tox.ini b/tox.ini index 07c56589..b68d9272 100644 --- a/tox.ini +++ b/tox.ini @@ -14,6 +14,7 @@ commands = coverage report --show-missing --fail-under 99 flake8 {[tox]project} testing tests setup.py # pylint {[tox]project} testing tests setup.py + pre-commit run --all-files [testenv:venv] envdir = venv-{[tox]project} From b0248fe2857b6e439a2e4ccf9aed1b727ba4c2f2 Mon Sep 17 00:00:00 2001 From: Chris Kuehl Date: Tue, 28 Jul 2015 23:28:44 -0400 Subject: [PATCH 2/3] Run reorder-python-imports on Python2.7 --- .pre-commit-config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 80452e60..ae00f49d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -20,3 +20,4 @@ sha: 3d86483455ab5bd06cc1069fdd5ac57be5463f10 hooks: - id: reorder-python-imports + language_version: python2.7 From 01fd58c6754c4e615ba3aaa9591586406b453db2 Mon Sep 17 00:00:00 2001 From: Chris Kuehl Date: Wed, 29 Jul 2015 00:41:56 -0400 Subject: [PATCH 3/3] Fix import ordering in clientlib/validate_base --- pre_commit/clientlib/validate_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pre_commit/clientlib/validate_base.py b/pre_commit/clientlib/validate_base.py index 68f67f04..3d08a6c3 100644 --- a/pre_commit/clientlib/validate_base.py +++ b/pre_commit/clientlib/validate_base.py @@ -3,12 +3,12 @@ from __future__ import unicode_literals import argparse import os.path -import pkg_resources import re import sys import jsonschema import jsonschema.exceptions +import pkg_resources import yaml from pre_commit.jsonschema_extensions import apply_defaults