diff options
| author | Ben Pfaff <blp@ovn.org> | 2019-09-20 08:30:42 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2019-09-27 09:23:50 -0700 |
| commit | 1ca0323e7c29dc7ef5a615c265df0460208f92de (patch) | |
| tree | 377630fee2130b269cfe2fd348c9e8c6bc5a814a /vtep | |
| parent | 187bb41fbf447acf9fb6ac117dc923bbe649e78c (diff) | |
| download | openvswitch-1ca0323e7c29dc7ef5a615c265df0460208f92de.tar.gz | |
Require Python 3 and remove support for Python 2.
Python 2 reaches end-of-life on January 1, 2020, which is only
a few months away. This means that OVS needs to stop depending
on in the next release that should occur roughly that same time.
Therefore, this commit removes all support for Python 2. It
also makes Python 3 a mandatory build dependency.
Some of the interesting consequences:
- HAVE_PYTHON, HAVE_PYTHON2, and HAVE_PYTHON3 conditionals have
been removed, since we now know that Python3 is available.
- $PYTHON and $PYTHON2 are removed, and $PYTHON3 is always
available.
- Many tests for Python 2 support have been removed, and the ones
that depended on Python 3 now run unconditionally. This allowed
several macros in the testsuite to be removed, making the code
clearer. This does make some of the changes to the testsuite
files large due to indentation level changes.
- #! lines for Python now use /usr/bin/python3 instead of
/usr/bin/python.
- Packaging depends on Python 3 packages.
Acked-by: Numan Siddique <nusiddiq@redhat.com>
Tested-by: Numan Siddique <nusiddiq@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'vtep')
| -rw-r--r-- | vtep/automake.mk | 4 | ||||
| -rwxr-xr-x | vtep/ovs-vtep.in | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/vtep/automake.mk b/vtep/automake.mk index 0f313dce3..e549922d9 100644 --- a/vtep/automake.mk +++ b/vtep/automake.mk @@ -53,18 +53,16 @@ pkgdata_DATA += vtep/vtep.ovsschema # # If "python" or "dot" is not available, then we do not add graphical diagram # to the documentation. -if HAVE_PYTHON if HAVE_DOT vtep/vtep.gv: ovsdb/ovsdb-dot.in vtep/vtep.ovsschema $(AM_V_GEN)$(OVSDB_DOT) --no-arrows $(srcdir)/vtep/vtep.ovsschema > $@ vtep/vtep.pic: vtep/vtep.gv ovsdb/dot2pic - $(AM_V_GEN)(dot -T plain < vtep/vtep.gv | $(PYTHON) $(srcdir)/ovsdb/dot2pic -f 3) > $@.tmp && \ + $(AM_V_GEN)(dot -T plain < vtep/vtep.gv | $(PYTHON3) $(srcdir)/ovsdb/dot2pic -f 3) > $@.tmp && \ mv $@.tmp $@ VTEP_PIC = vtep/vtep.pic VTEP_DOT_DIAGRAM_ARG = --er-diagram=$(VTEP_PIC) CLEANFILES += vtep/vtep.gv vtep/vtep.pic endif -endif # VTEP schema documentation EXTRA_DIST += vtep/vtep.xml diff --git a/vtep/ovs-vtep.in b/vtep/ovs-vtep.in index 338387075..de848d1a0 100755 --- a/vtep/ovs-vtep.in +++ b/vtep/ovs-vtep.in @@ -1,4 +1,4 @@ -#! @PYTHON@ +#! @PYTHON3@ # Copyright (C) 2013 Nicira, Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); |