From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
To: Linux Doc Mailing List <linux-doc@vger.kernel.org>,
Jonathan Corbet <corbet@lwn.net>
Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
"Akira Yokosawa" <akiyks@gmail.com>,
"Mauro Carvalho Chehab" <mchehab+huawei@kernel.org>,
"Sai Vishnu M" <saivishnu725@gmail.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 06/15] scripts: sphinx-pre-install: drop obsolete routines
Date: Mon, 30 Jun 2025 23:34:54 +0200 [thread overview]
Message-ID: <1287964385f0df25c2b0cf91c51d1dfcdeaea8fc.1751318230.git.mchehab+huawei@kernel.org> (raw)
In-Reply-To: <cover.1751318230.git.mchehab+huawei@kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
scripts/sphinx-pre-install.py | 23 +----------------------
1 file changed, 1 insertion(+), 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
@@ -114,27 +114,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):
@@ -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")
--
2.50.0
next prev parent reply other threads:[~2025-06-30 21:52 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-30 21:34 [PATCH 00/15] Translate sphinx-pre-install to Python Mauro Carvalho Chehab
2025-06-30 21:34 ` [PATCH 01/15] scripts: sphinx-pre-install: fix version check for Fedora Mauro Carvalho Chehab
2025-06-30 21:34 ` [PATCH 02/15] scripts: sphinx-pre-install: rename it to scripts/sphinx-pre-install.pl Mauro Carvalho Chehab
2025-06-30 21:34 ` [PATCH 03/15] scripts: sphinx-pre-install: Convert script to Python Mauro Carvalho Chehab
2025-06-30 21:34 ` [PATCH 04/15] scripts: sphinx-pre-install: Make it compatible with Python 3.6 Mauro Carvalho Chehab
2025-06-30 21:34 ` [PATCH 05/15] scripts: sphinx-pre-install: run on a supported version Mauro Carvalho Chehab
2025-06-30 21:34 ` Mauro Carvalho Chehab [this message]
2025-06-30 21:34 ` [PATCH 07/15] scripts: sphinx-pre-install: drop support for old virtualenv Mauro Carvalho Chehab
2025-06-30 21:34 ` [PATCH 08/15] scripts: sphinx-pre-install: Address issues with OpenSUSE Leap 15.x Mauro Carvalho Chehab
2025-06-30 21:34 ` [PATCH 09/15] scripts: sphinx-pre-install.py fix opensuse hints Mauro Carvalho Chehab
2025-06-30 21:34 ` [PATCH 10/15] scripts: sphinx-pre-install.py: fix support for gentoo Mauro Carvalho Chehab
2025-06-30 21:34 ` [PATCH 11/15] scripts: sphinx-pre-install: Address issues with OpenSUSE Tumbleweed Mauro Carvalho Chehab
2025-06-30 21:35 ` [PATCH 12/15] scripts: sphinx-pre-install.py: only show portage hints once Mauro Carvalho Chehab
2025-06-30 21:35 ` [PATCH 13/15] scripts: sphinx-pre-install.py: cleanup rhel support Mauro Carvalho Chehab
2025-06-30 21:35 ` [PATCH 14/15] docs: Makefile: switch to the new scripts/sphinx-pre-install.py Mauro Carvalho Chehab
2025-06-30 21:35 ` [PATCH 15/15] scripts: sphinx-pre-install.pl: get rid of the old script Mauro Carvalho Chehab
2025-07-02 23:03 ` [PATCH 00/15] Translate sphinx-pre-install to Python Jonathan Corbet
2025-07-09 8:25 ` Mauro Carvalho Chehab
2025-07-08 3:09 ` Akira Yokosawa
2025-07-08 14:25 ` Jonathan Corbet
2025-07-08 14:56 ` Akira Yokosawa
2025-07-09 9:17 ` Mauro Carvalho Chehab
2025-07-31 11:51 ` Mauro Carvalho Chehab
2025-07-31 17:55 ` Mauro Carvalho Chehab
2025-08-06 3:13 ` Akira Yokosawa
2025-07-09 8:58 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1287964385f0df25c2b0cf91c51d1dfcdeaea8fc.1751318230.git.mchehab+huawei@kernel.org \
--to=mchehab+huawei@kernel.org \
--cc=akiyks@gmail.com \
--cc=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=saivishnu725@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®