From d850d677da4954f0e1f2d6340fc92e4cee9e36be Mon Sep 17 00:00:00 2001 From: kevgliss Date: Thu, 23 Jul 2015 09:54:38 -0700 Subject: [PATCH] Fixing postgres command --- .travis.yml | 3 ++- hooks/pre-commit | 10 +--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd3e32cf..360f6131 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,8 @@ env: install: - make develop dev-postgres before_script: - - psql -c "create database lemur; create user lemur with password 'lemur;'" -U postgres + - psql -c "create database lemur;" -U postgres + - psql -c "create user lemur with password 'lemur;'" -U postgres - npm install -g bower script: - make lint diff --git a/hooks/pre-commit b/hooks/pre-commit index b41d5f35..5925a453 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit @@ -29,14 +29,6 @@ def py_lint(files_modified): return report.total_errors != 0 -def js_lint(files_modified): - has_errors = False - if os.system('node_modules/.bin/jshint src/sentry'): - has_errors = True - - return has_errors - - def main(): from flake8.hooks import run @@ -46,7 +38,7 @@ def main(): files_modified = filter(lambda x: os.path.exists(x), files_modified) - if any((py_lint(files_modified), js_lint(files_modified))): + if py_lint(files_modified): return 1 return 0