diff options
| author | Daniel Hahler <git@thequod.de> | 2019-08-06 18:53:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-06 18:53:51 +0200 |
| commit | 8218d474fa61dbcb221f199506c7c85f60a5e170 (patch) | |
| tree | 46b57c8a748558cf5ae094758a85f09b60faeb02 | |
| parent | e85b4e749e21a79a700edd7f0744eeaaaea804d5 (diff) | |
| download | rneovim-8218d474fa61dbcb221f199506c7c85f60a5e170.tar.gz rneovim-8218d474fa61dbcb221f199506c7c85f60a5e170.tar.bz2 rneovim-8218d474fa61dbcb221f199506c7c85f60a5e170.zip | |
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.
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | 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}) @@ -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". |