From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3156C4707F for ; Tue, 25 May 2021 13:28:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DE62960200 for ; Tue, 25 May 2021 13:28:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233469AbhEYN3e (ORCPT ); Tue, 25 May 2021 09:29:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:51234 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233472AbhEYN3D (ORCPT ); Tue, 25 May 2021 09:29:03 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6D46F6142E; Tue, 25 May 2021 13:27:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621949253; bh=G5T3FBq3c73v2BlrVGNRz2ClgCthrJuqOvTanh2Lelw=; h=From:To:Cc:Subject:Date:From; b=UC8hD31L22/MsAdLn9dCgs7knTkd0MUzxxa8aPjAfNS/wVFzBzMX8r67q55h5l91p yPTdXhlhXaKy9DwniY8Bma5mOl79deB56oPaCkDjcrvuuxIx3aKMEaiGbNFU2f4h7M L6wTvuMDFgHa4jvNA+f7zJ6W64SGL5DsQevDrBbtUGyiK5iHSRt5PEtZcP6VcWfFS6 cEk4npbjo/iw4HyDPEnifsuvQqKLXfZ/vFqPZW3dHO5icGnb3N1IMh/DjQHuhAfCE1 VjUF5QNaEtQUX10EJl6x7zqzwR5mg52/F1BkQhBp8pXFE/H26LjJKBDHKRUpz71NUE w0J3WkuxhGsmw== Received: by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1llX5m-000uZi-Dd; Tue, 25 May 2021 15:27:30 +0200 From: Mauro Carvalho Chehab To: Jonathan Corbet , Linux Doc Mailing List Cc: Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, Mauro Carvalho Chehab Subject: [PATCH 0/2] Fix some issues at scripts/sphinx-pre-install Date: Tue, 25 May 2021 15:27:26 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Mauro Carvalho Chehab Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org Currently, when using with --no-virtualenv, the script doesn't behave well, as it prints both instructions to install Sphinx via distribution's package manager and via pip. Address it. While here, rework the logic which recommends Sphinx install, by splitting it into three parts and making easier to maintain it, as there are too much complexity there. Splitting the Sphinx part of the logic on 3 separate functions allow to detect if the venv/virtualenv python packages are needed or not, and helps to have a cleaner logic. Mauro Carvalho Chehab (2): scripts: sphinx-pre-install: rework the sphinx install logic scripts: sphinx-pre-install: fix the need of virtenv packages scripts/sphinx-pre-install | 262 +++++++++++++++++++++++++------------ 1 file changed, 180 insertions(+), 82 deletions(-) -- 2.31.1