From patchwork Wed Sep 18 23:33:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 1164306 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46Yg493tN6z9s7T for ; Thu, 19 Sep 2019 11:58:33 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 2B701101E; Thu, 19 Sep 2019 01:57:59 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id E2D16F8F for ; Thu, 19 Sep 2019 01:57:57 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id BDDF976D for ; Thu, 19 Sep 2019 01:57:54 +0000 (UTC) X-Originating-IP: 75.54.222.30 Received: from sigfpe.attlocal.net (75-54-222-30.lightspeed.rdcyca.sbcglobal.net [75.54.222.30]) (Authenticated sender: blp@ovn.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 1DE5A1BF203; Thu, 19 Sep 2019 01:57:50 +0000 (UTC) From: Ben Pfaff To: dev@openvswitch.org Date: Wed, 18 Sep 2019 16:33:16 -0700 Message-Id: <20190918233322.24305-1-blp@ovn.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, URI_NOVOWEL autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Ben Pfaff Subject: [ovs-dev] [PATCH v2 python3 0/6] Remove Python 2 support X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Python 2 will reach end-of-life at the beginning of 2020, in only a few months. This series removes support for Python 2 from OVS and requires Python 3. v1->v2: - Fixed build problems found by travis. - Added a couple of commits at the beginning to make travis failures more debuggable. - Fix test for sphinx-build, which always treated it as present. - Use pip3 on Mac OSX instead of pip2. - Fix "#! @PYTHON@" lines in numerous scripts to read "#! @PYTHON3@". Ben Pfaff (6): travis: Obtain testsuite logs from the correct directory. travis: Dump config.log if make fails. Documentation: Work with sphinx-build for Python 3 also. Recommend Sphinx from Python 3 in documentation and packaging. xenserver: Make Python files parse in Python 3 also. Require Python 3 and remove support for Python 2. .cirrus.yml | 3 +- .travis.yml | 2 +- .travis/linux-build.sh | 4 +- .travis/osx-build.sh | 10 +- .travis/osx-prepare.sh | 4 +- Documentation/automake.mk | 1 - Documentation/intro/install/documentation.rst | 6 +- Documentation/intro/install/fedora.rst | 4 +- Documentation/intro/install/general.rst | 8 +- Documentation/intro/install/netbsd.rst | 10 +- Documentation/intro/install/rhel.rst | 4 +- Documentation/intro/install/windows.rst | 4 +- Documentation/intro/install/xenserver.rst | 4 +- Makefile.am | 12 +- Vagrantfile | 24 +- Vagrantfile-FreeBSD | 2 +- appveyor.yml | 2 +- build-aux/check-structs | 2 +- build-aux/dpdkstrip.py | 2 +- build-aux/extract-ofp-actions | 2 +- build-aux/extract-ofp-errors | 2 +- build-aux/extract-ofp-fields | 2 +- build-aux/extract-ofp-msgs | 2 +- build-aux/sodepends.py | 2 +- build-aux/soexpand.py | 2 +- build-aux/text2c | 2 +- build-aux/xml2nroff | 2 +- configure.ac | 3 +- debian/.gitignore | 1 + debian/automake.mk | 4 +- debian/control | 35 +- debian/openvswitch-test.install | 2 +- debian/python-openvswitch.install | 1 - ...nvswitch.dirs => python3-openvswitch.dirs} | 0 debian/python3-openvswitch.install | 1 + debian/rules | 2 +- include/openflow/automake.mk | 2 - ipsec/ovs-monitor-ipsec.in | 2 +- m4/openvswitch.m4 | 112 +---- manpages.mk | 6 - ovn/automake.mk | 8 +- ovsdb/ovsdb-dot.in | 2 +- ovsdb/ovsdb-idlc.in | 2 +- python/automake.mk | 9 +- rhel/openvswitch-fedora.spec.in | 2 +- rhel/openvswitch.spec.in | 2 +- tests/atlocal.in | 42 +- tests/automake.mk | 2 +- tests/check-structs.at | 3 +- tests/checkpatch.at | 17 +- tests/daemon-py.at | 453 ++++++++---------- tests/flowgen.py | 2 +- tests/interface-reconfigure.at | 2 +- tests/json.at | 57 +-- tests/jsonrpc-py.at | 67 +-- tests/library.at | 42 +- tests/ofproto-dpif.at | 10 +- tests/ofproto.at | 4 +- tests/ovs-macros.at | 2 +- tests/ovs-xapi-sync.at | 3 +- tests/ovsdb-data.at | 9 +- tests/ovsdb-idl.at | 188 ++------ tests/ovsdb-macros.at | 52 +- tests/ovsdb-monitor.at | 20 +- tests/reconnect.at | 13 +- tests/system-common-macros.at | 2 +- tests/system-kmod-macros.at | 3 +- tests/system-traffic.at | 16 +- tests/system-userspace-macros.at | 4 +- tests/unixctl-py.at | 208 ++++---- tests/vlog.at | 219 ++++----- utilities/automake.mk | 5 +- utilities/bugtool/automake.mk | 2 - utilities/bugtool/ovs-bugtool.in | 2 +- utilities/checkpatch.py | 2 +- utilities/ovs-check-dead-ifs.in | 2 +- utilities/ovs-dpctl-top.in | 2 +- utilities/ovs-l3ping.in | 2 +- utilities/ovs-parse-backtrace.in | 2 +- utilities/ovs-pcap.in | 2 +- utilities/ovs-tcpdump.in | 2 +- utilities/ovs-tcpundump.in | 2 +- utilities/ovs-test.in | 2 +- utilities/ovs-vlan-test.in | 2 +- vswitchd/automake.mk | 4 +- vtep/automake.mk | 4 +- vtep/ovs-vtep.in | 2 +- ...urce_libexec_InterfaceReconfigureBridge.py | 10 +- ...xsconsole_plugins-base_XSFeatureVSwitch.py | 14 +- 89 files changed, 679 insertions(+), 1144 deletions(-) delete mode 100644 debian/python-openvswitch.install rename debian/{python-openvswitch.dirs => python3-openvswitch.dirs} (100%) create mode 100644 debian/python3-openvswitch.install Acked-by: Numan Siddique for the whole series with