From 0f6cb94151cd79c95590e86838e2c6525fda27f4 Mon Sep 17 00:00:00 2001 From: Andrei Pavel Date: Fri, 9 May 2025 15:16:21 +0300 Subject: [PATCH] Hammer: Fix sphinx installation on Alpine --- hammer.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/hammer.py b/hammer.py index 46ceec8037..ad3ecf596c 100755 --- 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') -- 2.47.2