Merge remote-tracking branch 'upstream/staging' into v5.x

* upstream/staging:
  refactor: use uv optionally

Signed-off-by: Akhil Narang <me@akhilnarang.dev>

Author: akhilnarang

bench/app.py

@@ -268,7 +268,10 @@ def install_resolved_apps(self, *args, **kwargs):
 
 	@step(title="Uninstalling App {repo}", success="App {repo} Uninstalled")
 	def uninstall(self):
-		self.bench.run(f"{self.bench.python} -m pip uninstall -y {self.name}")
+		if os.environ.get("BENCH_USE_UV"):
+			self.bench.run(f"uv pip uninstall {self.name} --python {self.bench.python}")
+		else:
+			self.bench.run(f"{self.bench.python} -m pip uninstall -y {self.name}")
 
 	def _get_dependencies(self):
 		from bench.utils.app import get_required_deps, required_apps_from_hooks
@@ -921,9 +924,14 @@ def install_app(
 				"PKG_CONFIG_PATH": get_mariadb_pkgconfig_path(),
 			}
 
-	bench.run(
-		f"{bench.python} -m pip install {quiet_flag} --upgrade -e {app_path} {cache_flag}", env=env
-	)
+	if os.environ.get("BENCH_USE_UV"):
+		bench.run(
+			f"uv pip install {quiet_flag} --upgrade -e {app_path} {cache_flag} --python {bench.python}", env=env
+		)
+	else:
+		bench.run(
+			f"{bench.python} -m pip install {quiet_flag} --upgrade -e {app_path} {cache_flag}", env=env
+		)
 
 	if conf.get("developer_mode"):
 		install_python_dev_dependencies(apps=app, bench_path=bench_path, verbose=verbose)

bench/bench.py

@@ -159,7 +159,10 @@ def reload(self, web=False, supervisor=True, systemd=True, _raise=True):
 	def get_installed_apps(self) -> List:
 		"""Returns list of installed apps on bench, not in excluded_apps.txt"""
 		try:
-			installed_packages = get_cmd_output(f"{self.python} -m pip freeze", cwd=self.name)
+			if os.environ.get("BENCH_USE_UV"):
+				installed_packages = get_cmd_output(f"uv pip freeze --python {self.python}", cwd=self.name)
+			else:
+				installed_packages = get_cmd_output(f"{self.python} -m pip freeze", cwd=self.name)
 		except Exception:
 			installed_packages = []
 
@@ -361,8 +364,11 @@ def env(self, python="python3"):
 		quiet_flag = "" if verbose else "--quiet"
 
 		if not os.path.exists(self.bench.python):
-			venv = get_venv_path(verbose=verbose, python=python)
-			self.run(f"{venv} env", cwd=self.bench.name)
+			if os.environ.get("BENCH_USE_UV"):
+				self.run("uv venv env", cwd=self.bench.name)
+			else:
+				venv = get_venv_path(verbose=verbose, python=python)
+				self.run(f"{venv} env", cwd=self.bench.name)
 
 		self.pip()
 		self.wheel()
@@ -379,10 +385,16 @@ def env(self, python="python3"):
 							"PKG_CONFIG_PATH": get_mariadb_pkgconfig_path(),
 						}
 
-				self.run(
-					f"{self.bench.python} -m pip install {quiet_flag} --upgrade -e {frappe}",
-					cwd=self.bench.name, env=env,
-				)
+				if os.environ.get("BENCH_USE_UV"):
+					self.run(
+						f"uv pip install {quiet_flag} --upgrade -e {frappe} --python {self.bench.python}",
+						cwd=self.bench.name, env=env,
+					)
+				else:
+					self.run(
+						f"{self.bench.python} -m pip install {quiet_flag} --upgrade -e {frappe}",
+						cwd=self.bench.name, env=env,
+					)
 
 	@step(title="Setting Up Bench Config", success="Bench Config Set Up")
 	def config(self, redis=True, procfile=True, additional_config=None):
@@ -503,7 +515,10 @@ def python(self, apps=None):
 						"PKG_CONFIG_PATH": get_mariadb_pkgconfig_path(),
 					}
 
-			self.run(f"{self.bench.python} -m pip install {quiet_flag} --upgrade -e {app_path}", env=env)
+			if os.environ.get("BENCH_USE_UV"):
+				self.run(f"uv pip install {quiet_flag} --upgrade -e {app_path} --python {self.bench.python}", env=env)
+			else:
+				self.run(f"{self.bench.python} -m pip install {quiet_flag} --upgrade -e {app_path}", env=env)
 
 	def node(self, apps=None):
 		"""Install and upgrade Node dependencies for specified / all apps on given Bench"""

bench/commands/make.py

@@ -248,11 +248,15 @@ def include_app_for_update(app_name):
 def pip(ctx, args):
 	"Run pip commands in bench env"
 	import os
+	import shutil
 
 	from bench.utils.bench import get_env_cmd
 
-	env_py = get_env_cmd("python")
-	os.execv(env_py, (env_py, "-m", "pip") + args)
+	if os.environ.get("BENCH_USE_UV") and (env_uv := shutil.which("uv")):
+		os.execv(env_uv, (env_uv, "pip") + args)
+	else:
+		env_py = get_env_cmd("python")
+		os.execv(env_py, (env_py, "-m", "pip") + args)
 
 
 @click.command(

bench/utils/bench.py

@@ -99,12 +99,20 @@ def install_python_dev_dependencies(bench_path=".", apps=None, verbose=False):
 		if os.path.exists(pyproject_path):
 			pyproject_deps = _generate_dev_deps_pattern(pyproject_path)
 			if pyproject_deps:
-				bench.run(f"{bench.python} -m pip install {quiet_flag} --upgrade {pyproject_deps}")
+				if os.environ.get("BENCH_USE_UV"):
+					bench.run(f"uv pip install {quiet_flag} --upgrade {pyproject_deps} --python {bench.python}")
+				else:
+					bench.run(f"{bench.python} -m pip install {quiet_flag} --upgrade {pyproject_deps}")
 
 		if not pyproject_deps and os.path.exists(dev_requirements_path):
-			bench.run(
-				f"{bench.python} -m pip install {quiet_flag} --upgrade -r {dev_requirements_path}"
-			)
+			if os.environ.get("BENCH_USE_UV"):
+				bench.run(
+					f"uv pip install {quiet_flag} --upgrade -r {dev_requirements_path} --python {bench.python}"
+				)
+			else:
+				bench.run(
+					f"{bench.python} -m pip install {quiet_flag} --upgrade -r {dev_requirements_path}"
+				)
 
 
 def _generate_dev_deps_pattern(pyproject_path):
@@ -240,11 +248,17 @@ def migrate_env(python, backup=False):
 	# Create virtualenv using specified python
 	def _install_app(app):
 		app_path = f"-e {os.path.join('apps', app)}"
-		exec_cmd(f"{pvenv}/bin/python -m pip install --upgrade {app_path}")
+		if os.environ.get("BENCH_USE_UV"):
+			exec_cmd(f"uv pip install --upgrade {app_path} --python {pyenv}/bin/python")
+		else:
+			exec_cmd(f"{pyenv}/bin/python -m pip install --upgrade {app_path}")
 
 	try:
 		logger.log(f"Setting up a New Virtual {python} Environment")
-		exec_cmd(f"{python} -m venv {pvenv}")
+		if os.environ.get("BENCH_USE_UV"):
+			exec_cmd(f"uv venv {pvenv}")
+		else:
+			exec_cmd(f"{python} -m venv {pvenv}")
 
 		# Install frappe first
 		_install_app("frappe")

pyproject.toml

@@ -28,6 +28,7 @@ dependencies = [
     "semantic-version~=2.10.0",
     "setuptools>=71.0.0",
     "tomli;python_version<'3.11'",
+    "uv~=0.7.12"
 ]
 dynamic = [
     "version",