From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id EE7563858CDA for ; Tue, 26 Jul 2022 07:26:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EE7563858CDA Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 37DC71FA10; Tue, 26 Jul 2022 07:26:07 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 1086213322; Tue, 26 Jul 2022 07:26:07 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id eCiyAg+X32L5aAAAMHmgww (envelope-from ); Tue, 26 Jul 2022 07:26:07 +0000 Message-ID: <56dc4bb8-e0db-7da8-21ed-be3b850493ca@suse.cz> Date: Tue, 26 Jul 2022 09:26:06 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH] contrib: use sphinx-build from a venv Content-Language: en-US From: =?UTF-8?Q?Martin_Li=c5=a1ka?= To: gcc-patches@gcc.gnu.org Cc: Jonathan Wakely , Overseers mailing list , "Frank Ch. Eigler" References: <7e41c1dd-d95a-0769-bfb5-c3713da240ab@suse.cz> In-Reply-To: <7e41c1dd-d95a-0769-bfb5-c3713da240ab@suse.cz> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, SPF_HELO_NONE, SPF_SOFTFAIL, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: overseers@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Overseers mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jul 2022 07:26:09 -0000 CCing overseers and Frank. Can you please help me with that? Thanks, Martin On 7/25/22 16:00, Martin Liška wrote: > Hi. > > As you likely know, I'm still working on transition of the current docs to Sphinx. > But for now, I've sent a modernizing patches for the current libgccjit documentation > and I will need a more recent version of Sphinx. > > Can please a maintainer install the package from pip? > > Something like: > virtualenv /home/gcc/venv && /home/gcc/venv/bin/pip install Sphinx > > or a similar location? > > Thanks, > Martin > > maintainer-scripts/ChangeLog: > > * update_web_docs_git: Use sphinx-build from a venv so that > we can use a recent version. > --- > maintainer-scripts/update_web_docs_git | 21 ++++++--------------- > 1 file changed, 6 insertions(+), 15 deletions(-) > > diff --git a/maintainer-scripts/update_web_docs_git b/maintainer-scripts/update_web_docs_git > index 996d29bfb68..4b01b3dc1c0 100755 > --- a/maintainer-scripts/update_web_docs_git > +++ b/maintainer-scripts/update_web_docs_git > @@ -176,23 +176,14 @@ for file in $MANUALS; do > fi > done > > -# The jit is a special-case, using sphinx rather than texinfo. > -# Specifically, the jit docs need sphinx 1.0 or later. > +# The jit is a special-case, using Sphinx rather than texinfo. > +# Specifically, the jit docs need Sphinx 3.0 or later. > # > -# The jit/docs Makefile uses the executable $(SPHINXBUILD), > -# defaulting to "sphinx-build". > -# > -# sphinx is packaged in Fedora and EPEL 6 within "python-sphinx", > -# in RHEL 8 within "python3-sphinx", > -# and in openSUSE within "python-Sphinx". > -# > -# For EPEL6, python-sphinx is sphinx 0.6.6, which is missing various > -# directives (e.g. ":c:macro:"), so we need the variant > -# python-sphinx10 package. The latter installs its executable as > -# /usr/bin/sphinx-1.0-build > -# so we needed to override SPHINXBUILD with this when invoking "make". > +# Use the Sphinx installed in a virtual environment so that > +# we don't depend on a system package. > + > pushd gcc/gcc/jit/docs > -make html || true > +make html SPHINXBUILD=/home/gcc/venv/bin/sphinx-build || true > popd > cp -a gcc/gcc/jit/docs/_build/html jit > mkdir -p $DOCSDIR/jit