← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/launchpad:remove-old-linter into launchpad:master

 

Colin Watson has proposed merging ~cjwatson/launchpad:remove-old-linter into launchpad:master with ~cjwatson/launchpad:pre-commit-lp-lint-doctest as a prerequisite.

Commit message:
Remove old linting infrastructure

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/407527

This is now entirely superseded by pre-commit.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:remove-old-linter into launchpad:master.
diff --git a/.gitignore b/.gitignore
index 502ce43..6576f52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,6 @@ database/schema/diagrams/*.dot
 thread*.request
 TAGS
 cover.txt
-lint.txt
 .shelf
 development-nohup.out
 opensource/launchpadlib/build
diff --git a/Makefile b/Makefile
index cee059f..2e3955b 100644
--- a/Makefile
+++ b/Makefile
@@ -138,12 +138,6 @@ check: clean build
 	${PY} -t ./test_on_merge.py $(VERBOSITY) $(TESTOPTS)
 	bzr status --no-pending
 
-lint: ${PY}
-	@bash ./utilities/lint
-
-lint-verbose: ${PY}
-	@bash ./utilities/lint -v
-
 logs:
 	mkdir logs
 
diff --git a/utilities/lint b/utilities/lint
deleted file mode 100755
index c767246..0000000
--- a/utilities/lint
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2009-2017 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-#
-# Runs pocketlint on files changed from parent branch.
-
-
-if [ -z "$1" ]; then
-    # No command line argument provided, lint all changed files.
-    files=$($(dirname "$0")/find-changed-files.sh)
-else
-    # Add newlines so grep filters out pyfiles correctly later.
-    files=`echo $* | tr " " "\n"`
-fi
-
-
-echo "= Launchpad lint ="
-echo ""
-echo "Checking for conflicts and issues in changed files."
-
-if [ -z "$files" ]; then
-    echo "No changed files detected."
-    exit 0
-else
-    echo
-    echo "Linting changed files:"
-    for file in $files; do
-        echo "  $file"
-    done
-fi
-
-# Sample data contains auto generated files with long lines.
-lint_files=`echo "$files" | env -i grep -v '\.sql$'`
-if [ -z "$lint_files" ]; then
-    exit 0
-fi
-lint_files=`echo "$lint_files" | tr " " "\n"`
-
-non_js_files=`echo "$lint_files" | env -i grep -v '\.js$'`
-
-ret=0
-if [ "$non_js_files" ]; then
-    echo ""
-    pocketlint $non_js_files 2>&1 || ret=$?
-fi
-exit $ret