From patchwork Wed Sep 18 23:33:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 1164310 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 46Yg7348NBz9s7T for ; Thu, 19 Sep 2019 12:01:03 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id EBC6C1059; Thu, 19 Sep 2019 01:59:01 +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 DD788104F for ; Thu, 19 Sep 2019 01:59:00 +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 6B67E8A8 for ; Thu, 19 Sep 2019 01:58:23 +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 302E31BF203; Thu, 19 Sep 2019 01:58:08 +0000 (UTC) From: Ben Pfaff To: dev@openvswitch.org Date: Wed, 18 Sep 2019 16:33:20 -0700 Message-Id: <20190918233322.24305-5-blp@ovn.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190918233322.24305-1-blp@ovn.org> References: <20190918233322.24305-1-blp@ovn.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=unavailable 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 4/6] Recommend Sphinx from Python 3 in documentation and packaging. 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 Signed-off-by: Ben Pfaff --- .travis.yml | 2 +- Documentation/intro/install/documentation.rst | 6 +++--- Documentation/intro/install/rhel.rst | 2 +- rhel/openvswitch-fedora.spec.in | 2 +- rhel/openvswitch.spec.in | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 370b3d0a6c98..68026312ba84 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ addons: - libjemalloc1 - libjemalloc-dev - libnuma-dev - - python-sphinx + - python3-sphinx - libelf-dev - selinux-policy-dev - libunbound-dev diff --git a/Documentation/intro/install/documentation.rst b/Documentation/intro/install/documentation.rst index d7eb25d9ef06..acf5b3a3ff33 100644 --- a/Documentation/intro/install/documentation.rst +++ b/Documentation/intro/install/documentation.rst @@ -45,11 +45,11 @@ Sphinx. A detailed guide on installing Sphinx in many environments is available on the `Sphinx website`__ but, for most Linux distributions, you can install with your package manager. For example, on Debian/Ubuntu run:: - $ sudo apt-get install python-sphinx + $ sudo apt-get install python3-sphinx Similarly, on RHEL/Fedora run:: - $ sudo dnf install python-sphinx + $ sudo dnf install python3-sphinx A ``requirements.txt`` is also provided in the ``/Documentation``, should you wish to install using ``pip``:: @@ -71,7 +71,7 @@ available on the `Sphinx website`__. Building -------- -Once Sphinx installed, the documentation can be built using the provided +Once Sphinx is installed, the documentation can be built using the provided Makefile targets:: $ make docs-check diff --git a/Documentation/intro/install/rhel.rst b/Documentation/intro/install/rhel.rst index 6f062e89446a..0e5ca2743ef5 100644 --- a/Documentation/intro/install/rhel.rst +++ b/Documentation/intro/install/rhel.rst @@ -89,7 +89,7 @@ And to install specific dependencies, use yum-builddep tool:: Once that is completed, remove the file ``/tmp/ovs.spec``. -If python-sphinx package is not available in your version of RHEL, you can +If python3-sphinx package is not available in your version of RHEL, you can install it via pip with 'pip install sphinx'. Open vSwitch requires python 2.7 or newer which is not available in older diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in index 9c752ff4ed4e..9c407123296a 100644 --- a/rhel/openvswitch-fedora.spec.in +++ b/rhel/openvswitch-fedora.spec.in @@ -79,7 +79,7 @@ BuildRequires: python3-devel BuildRequires: desktop-file-utils BuildRequires: groff graphviz BuildRequires: checkpolicy, selinux-policy-devel -BuildRequires: /usr/bin/sphinx-build +BuildRequires: /usr/bin/sphinx3-build # make check dependencies BuildRequires: %{_py2}-twisted%{?rhel:-core} %{_py2}-zope-interface %{_py2}-six BuildRequires: procps-ng diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in index c8361f5f29ff..7f27fedd6886 100644 --- a/rhel/openvswitch.spec.in +++ b/rhel/openvswitch.spec.in @@ -37,7 +37,7 @@ BuildRequires: python-six BuildRequires: openssl-devel BuildRequires: checkpolicy, selinux-policy-devel BuildRequires: autoconf, automake, libtool -BuildRequires: python-sphinx +BuildRequires: python3-sphinx BuildRequires: unbound-devel %bcond_without check