Fix standalone module import check

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4cd7ff9..915638c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,11 @@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 
+# Helper values for calling builtin functions
+empty :=
+space := $(empty) $(empty)
+comma := ,
+
 # Use bash in order to be able to use pipefail
 SHELL=/bin/bash
 
@@ -19,6 +24,7 @@ CHECK_PYTHON_CODE = $(top_srcdir)/autotools/check-python-code
 CHECK_MAN = $(top_srcdir)/autotools/check-man
 CHECK_VERSION = $(top_srcdir)/autotools/check-version
 CHECK_NEWS = $(top_srcdir)/autotools/check-news
+CHECK_IMPORTS = $(top_srcdir)/autotools/check-imports
 DOCPP = $(top_srcdir)/autotools/docpp
 REPLACE_VARS_SED = autotools/replace_vars.sed
 CONVERT_CONSTANTS = $(top_srcdir)/autotools/convert-constants
@@ -150,15 +156,17 @@ CLEANFILES = \
 BUILT_SOURCES = \
        ganeti \
        stamp-srclinks \
-       lib/_autoconf.py \
-       lib/_vcsversion.py \
        $(all_dirfiles) \
-       $(PYTHON_BOOTSTRAP)
+       $(PYTHON_BOOTSTRAP) \
+       $(BUILT_PYTHON_SOURCES)
 
-nodist_pkgpython_PYTHON = \
+BUILT_PYTHON_SOURCES = \
        lib/_autoconf.py \
        lib/_vcsversion.py
 
+nodist_pkgpython_PYTHON = \
+       $(BUILT_PYTHON_SOURCES)
+
 noinst_PYTHON = \
        lib/build/__init__.py \
        lib/build/sphinx_ext.py
@@ -294,6 +302,7 @@ docrst = \
        doc/design-multi-reloc.rst \
        doc/design-network.rst \
        doc/design-chained-jobs.rst \
+       doc/design-ovf-support.rst \
        doc/cluster-merge.rst \
        doc/design-shared-storage.rst \
        doc/devnotes.rst \
@@ -364,7 +373,7 @@ $(RUN_IN_TEMPDIR): | $(all_dirfiles)
 # it changes
 doc/html/index.html: $(docrst) $(docpng) doc/conf.py configure.ac \
        $(RUN_IN_TEMPDIR) lib/build/sphinx_ext.py lib/opcodes.py lib/ht.py \
-       | lib/_autoconf.py lib/_vcsversion.py
+       | $(BUILT_PYTHON_SOURCES)
        @test -n "$(SPHINX)" || \
            { echo 'sphinx-build' not found during configure; exit 1; }
        @mkdir_p@ $(dir $@)
@@ -532,6 +541,7 @@ EXTRA_DIST = \
        pylintrc \
        autotools/build-bash-completion \
        autotools/check-python-code \
+       autotools/check-imports \
        autotools/check-man \
        autotools/check-news \
        autotools/check-tar \
@@ -744,6 +754,7 @@ srclink_files = \
 
 check_python_code = \
        $(BUILD_BASH_COMPLETION) \
+       $(CHECK_IMPORTS) \
        $(DOCPP) \
        $(all_python_code)
 
@@ -754,9 +765,14 @@ lint_python_code = \
        $(dist_tools_PYTHON) \
        $(pkglib_python_scripts) \
        $(BUILD_BASH_COMPLETION) \
+       $(CHECK_IMPORTS) \
        $(DOCPP) \
        $(PYTHON_BOOTSTRAP)
 
+standalone_python_modules = \
+       lib/rapi/client.py \
+       tools/ganeti-listrunner
+
 test/daemon-util_unittest.bash: daemons/daemon-util
 
 test/ganeti-cleaner_unittest.bash: daemons/ganeti-cleaner
@@ -1040,10 +1056,12 @@ check-dirs: $(BUILT_SOURCES)
                if test -n "$$error"; then exit 1; else exit 0; fi; \
        }
 
-check-local: check-dirs
+.PHONY: check-local
+check-local: check-dirs $(BUILT_SOURCES)
        $(CHECK_PYTHON_CODE) $(check_python_code)
        $(CHECK_VERSION) $(VERSION) $(top_srcdir)/NEWS
        $(CHECK_NEWS) < $(top_srcdir)/NEWS
+       PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(CHECK_IMPORTS) . $(standalone_python_modules)
        expver=$(VERSION_MAJOR).$(VERSION_MINOR); \
        if test "`head -n 1 $(top_srcdir)/README`" != "Ganeti $$expver"; then \
                echo "Incorrect version in README, expected $$expver"; \
@@ -1062,9 +1080,23 @@ hs-check: htools/test
        @rm -f test.tix
        ./htools/test
 
+# E111: indentation is not a multiple of four
+# E261: at least two spaces before inline comment
+# E501: line too long (80 characters)
+PEP8_IGNORE = E111,E261,E501
+
+# For excluding pep8 expects filenames only, not whole paths
+PEP8_EXCLUDE = $(subst $(space),$(comma),$(strip $(notdir $(BUILT_PYTHON_SOURCES))))
+
 .PHONY: lint
 lint: $(BUILT_SOURCES)
        @test -n "$(PYLINT)" || { echo 'pylint' not found during configure; exit 1; }
+       if test -z "$(PEP8)"; then \
+               echo '"pep8" not found during configure' >&2; \
+       else \
+               $(PEP8) --repeat --ignore='$(PEP8_IGNORE)' --exclude='$(PEP8_EXCLUDE)' \
+                       $(lint_python_code); \
+       fi
        $(PYLINT) $(LINT_OPTS) $(lint_python_code)
        cd $(top_srcdir)/qa && \
          PYTHONPATH=$(abs_top_srcdir) $(PYLINT) $(LINT_OPTS) \