1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
https://github.com/randombit/botan/commit/0fed26215b52a3d30122deb528f6b4deb824eae7
From 0fed26215b52a3d30122deb528f6b4deb824eae7 Mon Sep 17 00:00:00 2001
From: Jack Lloyd <jack@randombit.net>
Date: Fri, 6 Sep 2024 11:56:01 -0400
Subject: [PATCH] Remove code relying on Python distutils
This was just used to check if Sphinx supports concurrency, but
Sphinx is also barely faster with 1 core vs 32, so it hardly matters.
Debian bug 1080557
---
src/scripts/build_docs.py | 45 ---------------------------------------
1 file changed, 45 deletions(-)
diff --git a/src/scripts/build_docs.py b/src/scripts/build_docs.py
index 6eb9b656c98..5bd04acb13b 100755
--- a/src/scripts/build_docs.py
+++ b/src/scripts/build_docs.py
@@ -18,18 +18,6 @@
import os
import stat
-def get_concurrency():
- """
- Get default concurrency level of build
- """
- def_concurrency = 2
-
- try:
- import multiprocessing
- return max(def_concurrency, multiprocessing.cpu_count())
- except ImportError:
- return def_concurrency
-
def have_prog(prog):
"""
Check if some named program exists in the path
@@ -124,37 +112,6 @@ def log_level():
return options
-def sphinx_supports_concurrency():
- import re
- from distutils.version import StrictVersion
-
- proc = subprocess.Popen(['sphinx-build', '--version'],
- stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT)
- output, _ = proc.communicate()
- if isinstance(output, bytes):
- output = output.decode('ascii')
- output = output.strip()
-
- # Sphinx v1.1.3
- # sphinx-build 1.7.4
- match = re.match(r'^(?:[a-zA-Z_-]+) v?(([0-9]+)\.([0-9]+))', output)
-
- if match is None:
- # If regex doesn't match, disable by default
- logging.warning("Did not recognize sphinx version from '%s'", output)
- return False
-
- version = StrictVersion(match.group(1))
-
- if version < StrictVersion('1.4'):
- # not supported
- return False
- if version == StrictVersion('3.0'):
- # Bug in Sphinx 3.0 https://github.com/sphinx-doc/sphinx/issues/7438
- return False
- return True
-
def read_config(config):
try:
f = open(config)
@@ -203,8 +160,6 @@ def main(args=None):
if with_sphinx:
sphinx_build = ['sphinx-build', '-q', '-c', cfg['sphinx_config_dir']]
- if sphinx_supports_concurrency():
- sphinx_build += ['-j', str(get_concurrency())]
cmds.append(sphinx_build + ['-b', 'html', handbook_src, handbook_output])
|
