mirror of
https://github.com/openvswitch/ovs
synced 2025-10-19 14:37:21 +00:00
1ca0323e7c
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>
119 lines
3.7 KiB
Makefile
119 lines
3.7 KiB
Makefile
ovstest_pyfiles = \
|
|
python/ovstest/__init__.py \
|
|
python/ovstest/args.py \
|
|
python/ovstest/rpcserver.py \
|
|
python/ovstest/tcp.py \
|
|
python/ovstest/tests.py \
|
|
python/ovstest/udp.py \
|
|
python/ovstest/util.py \
|
|
python/ovstest/vswitch.py
|
|
|
|
ovs_pyfiles = \
|
|
python/ovs/__init__.py \
|
|
python/ovs/compat/__init__.py \
|
|
python/ovs/compat/sortedcontainers/__init__.py \
|
|
python/ovs/compat/sortedcontainers/sortedlist.py \
|
|
python/ovs/compat/sortedcontainers/sorteddict.py \
|
|
python/ovs/compat/sortedcontainers/sortedset.py \
|
|
python/ovs/daemon.py \
|
|
python/ovs/fcntl_win.py \
|
|
python/ovs/db/__init__.py \
|
|
python/ovs/db/custom_index.py \
|
|
python/ovs/db/data.py \
|
|
python/ovs/db/error.py \
|
|
python/ovs/db/idl.py \
|
|
python/ovs/db/parser.py \
|
|
python/ovs/db/schema.py \
|
|
python/ovs/db/types.py \
|
|
python/ovs/fatal_signal.py \
|
|
python/ovs/json.py \
|
|
python/ovs/jsonrpc.py \
|
|
python/ovs/ovsuuid.py \
|
|
python/ovs/poller.py \
|
|
python/ovs/process.py \
|
|
python/ovs/reconnect.py \
|
|
python/ovs/socket_util.py \
|
|
python/ovs/stream.py \
|
|
python/ovs/timeval.py \
|
|
python/ovs/unixctl/__init__.py \
|
|
python/ovs/unixctl/client.py \
|
|
python/ovs/unixctl/server.py \
|
|
python/ovs/util.py \
|
|
python/ovs/version.py \
|
|
python/ovs/vlog.py \
|
|
python/ovs/winutils.py
|
|
# These python files are used at build time but not runtime,
|
|
# so they are not installed.
|
|
EXTRA_DIST += \
|
|
python/build/__init__.py \
|
|
python/build/nroff.py \
|
|
python/build/soutil.py
|
|
|
|
# PyPI support.
|
|
EXTRA_DIST += \
|
|
python/ovs/compat/sortedcontainers/LICENSE \
|
|
python/README.rst \
|
|
python/setup.py
|
|
|
|
# C extension support.
|
|
EXTRA_DIST += python/ovs/_json.c
|
|
|
|
PYFILES = $(ovs_pyfiles) python/ovs/dirs.py $(ovstest_pyfiles)
|
|
EXTRA_DIST += $(PYFILES)
|
|
PYCOV_CLEAN_FILES += $(PYFILES:.py=.py,cover)
|
|
|
|
FLAKE8_PYFILES += \
|
|
$(filter-out python/ovs/compat/% python/ovs/dirs.py,$(PYFILES)) \
|
|
python/setup.py \
|
|
python/build/__init__.py \
|
|
python/build/nroff.py \
|
|
python/ovs/dirs.py.template
|
|
|
|
nobase_pkgdata_DATA = $(ovs_pyfiles) $(ovstest_pyfiles)
|
|
ovs-install-data-local:
|
|
$(MKDIR_P) python/ovs
|
|
sed \
|
|
-e '/^##/d' \
|
|
-e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
|
|
-e 's,[@]RUNDIR[@],$(RUNDIR),g' \
|
|
-e 's,[@]LOGDIR[@],$(LOGDIR),g' \
|
|
-e 's,[@]bindir[@],$(bindir),g' \
|
|
-e 's,[@]sysconfdir[@],$(sysconfdir),g' \
|
|
-e 's,[@]DBDIR[@],$(DBDIR),g' \
|
|
< $(srcdir)/python/ovs/dirs.py.template \
|
|
> python/ovs/dirs.py.tmp
|
|
$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/python/ovs
|
|
$(INSTALL_DATA) python/ovs/dirs.py.tmp $(DESTDIR)$(pkgdatadir)/python/ovs/dirs.py
|
|
rm python/ovs/dirs.py.tmp
|
|
|
|
python-sdist: $(srcdir)/python/ovs/version.py $(ovs_pyfiles) python/ovs/dirs.py
|
|
(cd python/ && $(PYTHON3) setup.py sdist)
|
|
|
|
pypi-upload: $(srcdir)/python/ovs/version.py $(ovs_pyfiles) python/ovs/dirs.py
|
|
(cd python/ && $(PYTHON3) setup.py sdist upload)
|
|
install-data-local: ovs-install-data-local
|
|
|
|
UNINSTALL_LOCAL += ovs-uninstall-local
|
|
ovs-uninstall-local:
|
|
rm -f $(DESTDIR)$(pkgdatadir)/python/ovs/dirs.py
|
|
|
|
ALL_LOCAL += $(srcdir)/python/ovs/version.py
|
|
$(srcdir)/python/ovs/version.py: config.status
|
|
$(AM_V_GEN)$(ro_shell) > $(@F).tmp && \
|
|
echo 'VERSION = "$(VERSION)"' >> $(@F).tmp && \
|
|
if cmp -s $(@F).tmp $@; then touch $@; rm $(@F).tmp; else mv $(@F).tmp $@; fi
|
|
|
|
ALL_LOCAL += $(srcdir)/python/ovs/dirs.py
|
|
$(srcdir)/python/ovs/dirs.py: python/ovs/dirs.py.template
|
|
$(AM_V_GEN)sed \
|
|
-e '/^##/d' \
|
|
-e 's,[@]pkgdatadir[@],/usr/local/share/openvswitch,g' \
|
|
-e 's,[@]RUNDIR[@],/var/run,g' \
|
|
-e 's,[@]LOGDIR[@],/usr/local/var/log,g' \
|
|
-e 's,[@]bindir[@],/usr/local/bin,g' \
|
|
-e 's,[@]sysconfdir[@],/usr/local/etc,g' \
|
|
-e 's,[@]DBDIR[@],/usr/local/etc/openvswitch,g' \
|
|
< $? > $@.tmp && \
|
|
mv $@.tmp $@
|
|
EXTRA_DIST += python/ovs/dirs.py.template
|