Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <cb916eae-fdf6-504f-8f38-7928e0fa8344@gmail.com>
Date:   Sat, 7 Jan 2023 14:17:24 +0900
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.4.2
To:     Jonathan Corbet <corbet@lwn.net>
Cc:     linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
        mchehab@kernel.org, mliska@suse.cz,
        Akira Yokosawa <akiyks@gmail.com>
References: <87wn629ggg.fsf@meer.lwn.net>
Subject: Re: [PATCH] docs: Fix the docs build with Sphinx 6.0
Content-Language: en-US
From:   Akira Yokosawa <akiyks@gmail.com>
In-Reply-To: <87wn629ggg.fsf@meer.lwn.net>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Wed, 04 Jan 2023 13:45:35 -0700, Jonathan Corbet wrote:
> Sphinx 6.0 removed the execfile_() function, which we use as part of th=
e
> configuration process.  They *did* warn us...  Just open-code the
> functionality as is done in Sphinx itself.
>=20
> Tested (using SPHINX_CONF, since this code is only executed with an
> alternative config file) on various Sphinx versions from 2.5 through 6.=
0.
>=20
> Reported-by: Martin Li=C5=A1ka <mliska@suse.cz>
> Signed-off-by: Jonathan Corbet <corbet@lwn.net>

I have tested full builds of documentation with this change
with Sphinx versions 1.7.9, 2.4.5, 3.4.3, 4.5.0, 5.3.0, and 6.0.0.

Tested-by: Akira Yokosawa <akiyks@gmail.com>

That said, Sphinx 6.0.0 needs much more time and memory than earlier
versions.

FYI, I needed to limit parallel slot to 2 (make -j2) on a 16GB machine.
If you are lucky, -j3 and -j4 might succeed. -j5 or more ended up in
OOM situations for me:

Comparison of elapsed time and maxresident with -j2:

  =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
  Sphinx version elapsed time maxresident
  =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
  5.3.0          10:16.81      937660
  6.0.0          17:29.07     5292392
  =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

        Thanks, Akira

> ---
>  Documentation/sphinx/load_config.py | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>=20
> diff --git a/Documentation/sphinx/load_config.py b/Documentation/sphinx=
/load_config.py
> index eeb394b39e2c..8b416bfd75ac 100644
> --- a/Documentation/sphinx/load_config.py
> +++ b/Documentation/sphinx/load_config.py
> @@ -3,7 +3,7 @@
> =20
>  import os
>  import sys
> -from sphinx.util.pycompat import execfile_
> +from sphinx.util.osutil import fs_encoding
> =20
>  # --------------------------------------------------------------------=
----------
>  def loadConfig(namespace):
> @@ -48,7 +48,9 @@ def loadConfig(namespace):
>              sys.stdout.write("load additional sphinx-config: %s\n" % c=
onfig_file)
>              config =3D namespace.copy()
>              config['__file__'] =3D config_file
> -            execfile_(config_file, config)
> +            with open(config_file, 'rb') as f:
> +                code =3D compile(f.read(), fs_encoding, 'exec')
> +                exec(code, config)
>              del config['__file__']
>              namespace.update(config)
>          else:
> --=20
> 2.38.1