Use PYTHONDONTWRITEBYTECODE=yes for invoking Python for build or test.

An upcoming commit will break the ovs.vlog module into an ovs.vlog package
with submodules.  This commit makes switching between trees with the old
structure and those with the new structure much easier.

This commit works by setting PYTHONDONTWRITEBYTECODE=yes in Python
invocations from the build system and testing.  This keeps Python 2.6+ from
creating .pyc and .pyo files.  Creating .py[co] works OK for any given
version of Open vSwitch, but it causes trouble if you switch from a version
with foo/__init__.py into an (older) version with plain foo.py, since
foo/__init__.pyc will cause Python to ignore foo.py.

Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/Makefile.am b/Makefile.am
index c0c100e76f906d818341a655eaec2f2deca70340..4b6156d14cb2ef0d8dee0605ff3baadeb3740ef5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,6 +22,16 @@ AM_CPPFLAGS += -DNDEBUG
 AM_CFLAGS += -fomit-frame-pointer
 endif
 
+# PYTHONDONTWRITEBYTECODE=yes keeps Python from creating .pyc and .pyo
+# files.  Creating .py[co] works OK for any given version of Open
+# vSwitch, but it causes trouble if you switch from a version with
+# foo/__init__.py into an (older) version with plain foo.py, since
+# foo/__init__.pyc will cause Python to ignore foo.py.
+run_python = \
+       PYTHONDONTWRITEBYTECODE=yes \
+       PYTHONPATH=$(top_srcdir)/python:$$PYTHONPATH \
+       $(PYTHON)
+
 ALL_LOCAL =
 BUILT_SOURCES =
 CLEANFILES =

diff --git a/include/openflow/automake.mk b/include/openflow/automake.mk
index 4b7bc07fdc53612303ec0a36b4be1e7ee00ff32f..38e8eefd16613ca769d642b9ccbb6197dcbdfb30 100644 (file)
--- a/include/openflow/automake.mk
+++ b/include/openflow/automake.mk
@@ -10,7 +10,7 @@ if HAVE_PYTHON
 SUFFIXES += .h .hstamp
 
 .h.hstamp:
-       $(PYTHON) $(srcdir)/build-aux/check-structs -I$(srcdir)/include $<
+       $(run_python) $(srcdir)/build-aux/check-structs -I$(srcdir)/include $<
        touch $@
 
 HSTAMP_FILES = \

diff --git a/lib/automake.mk b/lib/automake.mk
index 62175268626f39ba16a6ced42a18d9341fae95a9..52e112bc165000ce1631fe0e7d02023fa2ea898d 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -298,7 +298,7 @@ lib/dirs.c: lib/dirs.c.in Makefile
 
 $(srcdir)/lib/ofp-errors.inc: \
        lib/ofp-errors.h $(srcdir)/build-aux/extract-ofp-errors
-       $(PYTHON) $(srcdir)/build-aux/extract-ofp-errors \
+       $(run_python) $(srcdir)/build-aux/extract-ofp-errors \
                $(srcdir)/lib/ofp-errors.h > $@.tmp && mv $@.tmp $@
 $(srcdir)/lib/ofp-errors.c: $(srcdir)/lib/ofp-errors.inc
 EXTRA_DIST += build-aux/extract-ofp-errors lib/ofp-errors.inc

diff --git a/python/automake.mk b/python/automake.mk
index a50a7628caaf5786b942f36d64960d99ca758398..4c0e78b4dec3fdb692a8322a510086acf5023ecb 100644 (file)
--- a/python/automake.mk
+++ b/python/automake.mk
@@ -1,5 +1,3 @@
-run_python = PYTHONPATH=$(top_srcdir)/python:$$PYTHONPATH $(PYTHON)
-
 ovstest_pyfiles = \
        python/ovstest/__init__.py \
        python/ovstest/args.py \

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 1d37b59a74aa18096cd461bdf54f4ad88a552aee..53602258cd9d3e33af9f52582aa4e4d763059c47 100644 (file)
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -13,6 +13,17 @@ export PYTHONPATH
 PYTHONIOENCODING=utf_8
 export PYTHONIOENCODING
 
+# PYTHONDONTWRITEBYTECODE=yes keeps Python 2.6+ from creating .pyc and .pyo
+# files.  Creating .py[co] works OK for any given version of Open
+# vSwitch, but it causes trouble if you switch from a version with
+# foo/__init__.py into an (older) version with plain foo.py, since
+# foo/__init__.pyc will cause Python to ignore foo.py.
+#
+# Python before version 2.6 always creates .pyc files, so if you develop
+# with such an older version then you're out of luck.
+PYTHONDONTWRITEBYTECODE=yes
+export PYTHONDONTWRITEBYTECODE
+
 if test $HAVE_PYTHON = yes; then
     if python -m argparse 2>/dev/null; then
         :

diff --git a/tests/automake.mk b/tests/automake.mk
index 784ae9cefff74c6e75d8edd44683f9233b78c8e8..b7e1b94e2598d1fc73945db9a422ef8f65963cc2 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -74,7 +74,7 @@ check-local: tests/atconfig tests/atlocal $(TESTSUITE)
 COVERAGE = coverage
 COVERAGE_FILE='$(abs_srcdir)/.coverage'
 check-pycov: all tests/atconfig tests/atlocal $(TESTSUITE) clean-pycov
-       COVERAGE_FILE=$(COVERAGE_FILE) PYTHON='$(COVERAGE) run -p' $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) $(TESTSUITEFLAGS)
+       PYTHONDONTWRITEBYTECODE=yes COVERAGE_FILE=$(COVERAGE_FILE) PYTHON='$(COVERAGE) run -p' $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) $(TESTSUITEFLAGS)
        @cd $(srcdir) && $(COVERAGE) combine && COVERAGE_FILE=$(COVERAGE_FILE) $(COVERAGE) annotate
        @echo
        @echo '----------------------------------------------------------------------'