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=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 93F1DC47080 for ; Tue, 1 Jun 2021 22:29:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6AC6F613BC for ; Tue, 1 Jun 2021 22:29:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234942AbhFAWbi (ORCPT ); Tue, 1 Jun 2021 18:31:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234799AbhFAWbi (ORCPT ); Tue, 1 Jun 2021 18:31:38 -0400 Received: from ms.lwn.net (ms.lwn.net [IPv6:2600:3c01:e000:3a1::42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A17BC061574; Tue, 1 Jun 2021 15:29:56 -0700 (PDT) Received: from localhost (unknown [IPv6:2601:281:8300:104d::5f6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ms.lwn.net (Postfix) with ESMTPSA id 3ADDB6E2; Tue, 1 Jun 2021 22:29:56 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 ms.lwn.net 3ADDB6E2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lwn.net; s=20201203; t=1622586596; bh=y9sxAzj+dWrVwmKL8DGxCyxl0p5fDGQaBGnGuwpqGfo=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=sJOtHjJwOq85gKYJk9beusRgOTjtW/UBduW9ZDIaQxVMj2pt0/IpQhNyOsmnuiJhM iiRq8qHrdqr2P8h8W5RFu4zfPg3NYhKiIjR4TT/r/jmlQkbH92UWdVMwJ4m8l2hun1 6mrNUmtR7ClYUpps4pRaWoesNg2sLeY3ywkTJwxasK2JpCV5ungGJsvnM21nHPLnMb JSn8qrzXkEeX/2DpLWuOpNqTYLvWyTc0a7DDLVr2N8cMgvh7qnsksW9iDr6nbLSkAj 5wqqNwRlJaAgXE4O1S5jxJxu16AQz/A7zkmPHxOLksaKMu8M7Q+gXwiijATQYBVDIC fGg2Qjekvkvdw== From: Jonathan Corbet To: Mauro Carvalho Chehab , Linux Doc Mailing List Cc: Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, Mauro Carvalho Chehab Subject: Re: [PATCH 0/2] Fix some issues at scripts/sphinx-pre-install In-Reply-To: References: Date: Tue, 01 Jun 2021 16:29:55 -0600 Message-ID: <87v96x8bh8.fsf@meer.lwn.net> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org Mauro Carvalho Chehab writes: > 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(-) I've applied this set, thanks. jon