summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>2025-08-12 17:52:23 +0200
committerJonathan Corbet <corbet@lwn.net>2025-08-13 10:19:16 -0600
commitea5dd67722c1ac8ae65ae5a9390452931890f52e (patch)
tree91424d34dba569d9a6f6b534831fdea3a31a9b5b
parent728648b6a5faa1d6be1e90c04a71481ba33fd08d (diff)
scripts: sphinx-pre-install: drop obsolete routines
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Signed-off-by: Jonathan Corbet <corbet@lwn.net> Link: https://lore.kernel.org/r/afb97854f05b0852f4c6c1fcee102e9697c14cd8.1754992972.git.mchehab+huawei@kernel.org
-rwxr-xr-xscripts/sphinx-pre-install.py23
1 files changed, 1 insertions, 22 deletions
diff --git a/scripts/sphinx-pre-install.py b/scripts/sphinx-pre-install.py
index 3912359d2bae..b639acd455cc 100755
--- a/scripts/sphinx-pre-install.py
+++ b/scripts/sphinx-pre-install.py
@@ -115,27 +115,6 @@ class SphinxDependencyChecker:
return None
@staticmethod
- def find_python_no_venv():
- # FIXME: does it makes sense now that this script is in Python?
-
- result = SphinxDependencyChecker.run(["pwd"], capture_output=True,
- text=True)
- cur_dir = result.stdout.strip()
-
- python_names = ["python3", "python"]
-
- for d in os.environ.get("PATH", "").split(":"):
- if f"{cur_dir}/sphinx" in d:
- continue
-
- for p in python_names:
- if os.access(os.path.join(d, p), os.X_OK):
- return os.path.join(d, p)
-
- # Python not found at the PATH
- return python_names[-1]
-
- @staticmethod
def get_python_version(cmd):
result = SphinxDependencyChecker.run([cmd, "--version"],
@@ -940,7 +919,7 @@ class SphinxDependencyChecker:
else:
print("\nSphinx needs to be installed either:\n1) via pip/pypi with:\n")
- self.python_cmd = self.find_python_no_venv()
+ self.python_cmd = os.path.abspath(sys.argv[0])
print(f"\t{virtualenv_cmd} {self.virtenv_dir}")
print(f"\t. {self.virtenv_dir}/bin/activate")