]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
Hammer: Fix sphinx installation on Alpine
authorAndrei Pavel <andrei@isc.org>
Fri, 9 May 2025 12:16:21 +0000 (15:16 +0300)
committerAndrei Pavel <andrei@isc.org>
Fri, 9 May 2025 12:16:21 +0000 (15:16 +0300)
hammer.py

index 46ceec803738e23242241d1d230a997b952ced3d..ad3ecf596c41754ff6ba36186bd89878a1a25779 100755 (executable)
--- a/hammer.py
+++ b/hammer.py
@@ -1988,14 +1988,7 @@ def prepare_system_local(features, check_times, ignore_errors_for):
                     'gzip']
 
         if 'docs' in features:
-            if revision == '3.10':
-                packages.extend(['py-sphinx', 'py-sphinx_rtd_theme'])
-            elif revision == '3.11':
-                packages.extend(['py3-sphinx'])
-            elif float(revision) < 3.16:
-                packages.extend(['py3-sphinx', 'py3-sphinx_rtd_theme'])
-            else:
-                packages.extend(['py3-pip'])
+            packages.extend(['py3-sphinx', 'py3-sphinx_rtd_theme'])
 
         if 'unittest' in features:
             _install_gtest_sources()
@@ -2021,11 +2014,6 @@ def prepare_system_local(features, check_times, ignore_errors_for):
 
         install_pkgs(packages, env=env, timeout=6 * 60, check_times=check_times)
 
-        # work around outdated sphinx packages on alpine 3.16
-        if 'docs' in features:
-            if float(revision) >= 3.16:
-                execute('sudo pip3 install -U sphinx sphinx_rtd_theme')
-
         # check for existence of 'vagrant' user and 'abuild' group before adding him to the group
         try:
             pwd.getpwnam('vagrant')