From 8218d474fa61dbcb221f199506c7c85f60a5e170 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Tue, 6 Aug 2019 18:53:51 +0200
Subject: build: move pylint to Makefile, optional with "make lint" (#10714)

This avoids errors when using "make lint", but "flake8" is not
available.  We do not want to install it then via third-party.
On CI "make pylint" is used explicitly.
---
 CMakeLists.txt |  9 ---------
 Makefile       | 10 +++++++---
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 947de61988..2314384d79 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -668,15 +668,6 @@ else()
     COMMENT "lualint: LUACHECK_PRG not defined")
 endif()
 
-if(FLAKE8_PRG)
-  add_custom_target(pylint
-    COMMAND ${FLAKE8_PRG} contrib/ scripts/ src/ test/
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-else()
-  add_custom_target(pylint false
-    COMMENT "flake8: FLAKE8_PRG not defined")
-endif()
-
 set(CPACK_PACKAGE_NAME "Neovim")
 set(CPACK_PACKAGE_VENDOR "neovim.io")
 set(CPACK_PACKAGE_VERSION ${NVIM_VERSION_MEDIUM})
diff --git a/Makefile b/Makefile
index e2cf4a3b29..243e371165 100644
--- a/Makefile
+++ b/Makefile
@@ -138,8 +138,8 @@ functionaltest-lua: | nvim
 lualint: | build/.ran-cmake deps
 	$(BUILD_CMD) -C build lualint
 
-pylint: | build/.ran-cmake deps
-	$(BUILD_CMD) -C build pylint
+pylint:
+	flake8 contrib/ scripts/ src/ test/
 
 unittest: | nvim
 	+$(BUILD_CMD) -C build unittest
@@ -182,7 +182,11 @@ appimage:
 appimage-%:
 	bash scripts/genappimage.sh $*
 
-lint: check-single-includes clint lualint pylint
+lint: check-single-includes clint lualint
+	@# Run pylint only if flake8 is installed.
+	@command -v flake8 \
+		&& { $(MAKE) pylint; exit $?; } \
+		|| echo "SKIP: pylint (flake8 not found)"
 
 # Generic pattern rules, allowing for `make build/bin/nvim` etc.
 # Does not work with "Unix Makefiles".
-- 
cgit